Skip to content

Commit a612815

Browse files
akrantzakrantz
authored
Merge pull request #24 from akrantz/simplify-resource-ids
Simplify resource ids
2 parents 5dac533 + cac65a6 commit a612815

File tree

7 files changed

+236
-236
lines changed

7 files changed

+236
-236
lines changed

‎manifest.excel.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@
2424
<Host xsi:type="Workbook">
2525
<DesktopFormFactor>
2626
<GetStarted>
27-
<Title resid="Contoso.GetStarted.Title"/>
28-
<Description resid="Contoso.GetStarted.Description"/>
29-
<LearnMoreUrl resid="Contoso.GetStarted.LearnMoreUrl"/>
27+
<Title resid="GetStarted.Title"/>
28+
<Description resid="GetStarted.Description"/>
29+
<LearnMoreUrl resid="GetStarted.LearnMoreUrl"/>
3030
</GetStarted>
31-
<FunctionFile resid="Contoso.Commands.Url" />
31+
<FunctionFile resid="Commands.Url" />
3232
<ExtensionPoint xsi:type="PrimaryCommandSurface">
3333
<OfficeTab id="TabHome">
34-
<Group id="Contoso.Group1">
35-
<Label resid="Contoso.Group1Label" />
34+
<Group id="CommandsGroup">
35+
<Label resid="CommandsGroup.Label" />
3636
<Icon>
37-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
38-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
39-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
37+
<bt:Image size="16" resid="Icon.16x16" />
38+
<bt:Image size="32" resid="Icon.32x32" />
39+
<bt:Image size="80" resid="Icon.80x80" />
4040
</Icon>
41-
<Control xsi:type="Button" id="Contoso.TaskpaneButton">
42-
<Label resid="Contoso.TaskpaneButton.Label" />
41+
<Control xsi:type="Button" id="TaskpaneButton">
42+
<Label resid="TaskpaneButton.Label" />
4343
<Supertip>
44-
<Title resid="Contoso.TaskpaneButton.Label" />
45-
<Description resid="Contoso.TaskpaneButton.Tooltip" />
44+
<Title resid="TaskpaneButton.Label" />
45+
<Description resid="TaskpaneButton.Tooltip" />
4646
</Supertip>
4747
<Icon>
48-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
49-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
50-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
48+
<bt:Image size="16" resid="Icon.16x16" />
49+
<bt:Image size="32" resid="Icon.32x32" />
50+
<bt:Image size="80" resid="Icon.80x80" />
5151
</Icon>
5252
<Action xsi:type="ShowTaskpane">
5353
<TaskpaneId>ButtonId1</TaskpaneId>
54-
<SourceLocation resid="Contoso.Taskpane.Url" />
54+
<SourceLocation resid="Taskpane.Url" />
5555
</Action>
5656
</Control>
5757
</Group>
@@ -62,23 +62,23 @@
6262
</Hosts>
6363
<Resources>
6464
<bt:Images>
65-
<bt:Image id="Contoso.tpicon_16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
66-
<bt:Image id="Contoso.tpicon_32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
67-
<bt:Image id="Contoso.tpicon_80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
65+
<bt:Image id="Icon.16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
66+
<bt:Image id="Icon.32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
67+
<bt:Image id="Icon.80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
6868
</bt:Images>
6969
<bt:Urls>
70-
<bt:Url id="Contoso.GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
71-
<bt:Url id="Contoso.Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
72-
<bt:Url id="Contoso.Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
70+
<bt:Url id="GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
71+
<bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
72+
<bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
7373
</bt:Urls>
7474
<bt:ShortStrings>
75-
<bt:String id="Contoso.GetStarted.Title" DefaultValue="Get started with your sample add-in!" />
76-
<bt:String id="Contoso.Group1Label" DefaultValue="Commands Group" />
77-
<bt:String id="Contoso.TaskpaneButton.Label" DefaultValue="Show Taskpane" />
75+
<bt:String id="GetStarted.Title" DefaultValue="Get started with your sample add-in!" />
76+
<bt:String id="CommandsGroup.Label" DefaultValue="Commands Group" />
77+
<bt:String id="TaskpaneButton.Label" DefaultValue="Show Taskpane" />
7878
</bt:ShortStrings>
7979
<bt:LongStrings>
80-
<bt:String id="Contoso.GetStarted.Description" DefaultValue="Your sample add-in loaded succesfully. Go to the HOME tab and click the 'Show Taskpane' button to get started." />
81-
<bt:String id="Contoso.TaskpaneButton.Tooltip" DefaultValue="Click to Show a Taskpane" />
80+
<bt:String id="GetStarted.Description" DefaultValue="Your sample add-in loaded succesfully. Go to the HOME tab and click the 'Show Taskpane' button to get started." />
81+
<bt:String id="TaskpaneButton.Tooltip" DefaultValue="Click to Show a Taskpane" />
8282
</bt:LongStrings>
8383
</Resources>
8484
</VersionOverrides>

‎manifest.onenote.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@
2424
<Host xsi:type="Notebook">
2525
<DesktopFormFactor>
2626
<GetStarted>
27-
<Title resid="Contoso.GetStarted.Title"/>
28-
<Description resid="Contoso.GetStarted.Description"/>
29-
<LearnMoreUrl resid="Contoso.GetStarted.LearnMoreUrl"/>
27+
<Title resid="GetStarted.Title"/>
28+
<Description resid="GetStarted.Description"/>
29+
<LearnMoreUrl resid="GetStarted.LearnMoreUrl"/>
3030
</GetStarted>
31-
<FunctionFile resid="Contoso.Commands.Url" />
31+
<FunctionFile resid="Commands.Url" />
3232
<ExtensionPoint xsi:type="PrimaryCommandSurface">
3333
<OfficeTab id="TabHome">
34-
<Group id="Contoso.Group1">
35-
<Label resid="Contoso.Group1Label" />
34+
<Group id="CommandsGroup">
35+
<Label resid="CommandsGroup.Label" />
3636
<Icon>
37-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
38-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
39-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
37+
<bt:Image size="16" resid="Icon.16x16" />
38+
<bt:Image size="32" resid="Icon.32x32" />
39+
<bt:Image size="80" resid="Icon.80x80" />
4040
</Icon>
41-
<Control xsi:type="Button" id="Contoso.TaskpaneButton">
42-
<Label resid="Contoso.TaskpaneButton.Label" />
41+
<Control xsi:type="Button" id="TaskpaneButton">
42+
<Label resid="TaskpaneButton.Label" />
4343
<Supertip>
44-
<Title resid="Contoso.TaskpaneButton.Label" />
45-
<Description resid="Contoso.TaskpaneButton.Tooltip" />
44+
<Title resid="TaskpaneButton.Label" />
45+
<Description resid="TaskpaneButton.Tooltip" />
4646
</Supertip>
4747
<Icon>
48-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
49-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
50-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
48+
<bt:Image size="16" resid="Icon.16x16" />
49+
<bt:Image size="32" resid="Icon.32x32" />
50+
<bt:Image size="80" resid="Icon.80x80" />
5151
</Icon>
5252
<Action xsi:type="ShowTaskpane">
5353
<TaskpaneId>ButtonId1</TaskpaneId>
54-
<SourceLocation resid="Contoso.Taskpane.Url" />
54+
<SourceLocation resid="Taskpane.Url" />
5555
</Action>
5656
</Control>
5757
</Group>
@@ -62,23 +62,23 @@
6262
</Hosts>
6363
<Resources>
6464
<bt:Images>
65-
<bt:Image id="Contoso.tpicon_16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
66-
<bt:Image id="Contoso.tpicon_32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
67-
<bt:Image id="Contoso.tpicon_80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
65+
<bt:Image id="Icon.16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
66+
<bt:Image id="Icon.32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
67+
<bt:Image id="Icon.80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
6868
</bt:Images>
6969
<bt:Urls>
70-
<bt:Url id="Contoso.GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
71-
<bt:Url id="Contoso.Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
72-
<bt:Url id="Contoso.Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
70+
<bt:Url id="GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
71+
<bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
72+
<bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
7373
</bt:Urls>
7474
<bt:ShortStrings>
75-
<bt:String id="Contoso.GetStarted.Title" DefaultValue="Get started with your sample add-in!" />
76-
<bt:String id="Contoso.Group1Label" DefaultValue="Commands Group" />
77-
<bt:String id="Contoso.TaskpaneButton.Label" DefaultValue="Show Taskpane" />
75+
<bt:String id="GetStarted.Title" DefaultValue="Get started with your sample add-in!" />
76+
<bt:String id="CommandsGroup.Label" DefaultValue="Commands Group" />
77+
<bt:String id="TaskpaneButton.Label" DefaultValue="Show Taskpane" />
7878
</bt:ShortStrings>
7979
<bt:LongStrings>
80-
<bt:String id="Contoso.GetStarted.Description" DefaultValue="Your sample add-in loaded succesfully. Go to the HOME tab and click the 'Show Taskpane' button to get started." />
81-
<bt:String id="Contoso.TaskpaneButton.Tooltip" DefaultValue="Click to Show a Taskpane" />
80+
<bt:String id="GetStarted.Description" DefaultValue="Your sample add-in loaded succesfully. Go to the HOME tab and click the 'Show Taskpane' button to get started." />
81+
<bt:String id="TaskpaneButton.Tooltip" DefaultValue="Click to Show a Taskpane" />
8282
</bt:LongStrings>
8383
</Resources>
8484
</VersionOverrides>

‎manifest.outlook.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,24 @@
4646
<Hosts>
4747
<Host xsi:type="MailHost">
4848
<DesktopFormFactor>
49-
<FunctionFile resid="Contoso.Commands.Url" />
49+
<FunctionFile resid="Commands.Url" />
5050
<ExtensionPoint xsi:type="MessageReadCommandSurface">
5151
<OfficeTab id="TabDefault">
5252
<Group id="msgReadGroup">
53-
<Label resid="Contoso.GroupLabel" />
53+
<Label resid="GroupLabel" />
5454
<Control xsi:type="Button" id="msgReadOpenPaneButton">
55-
<Label resid="Contoso.TaskpaneButton.Label" />
55+
<Label resid="TaskpaneButton.Label" />
5656
<Supertip>
57-
<Title resid="Contoso.TaskpaneButton.Label" />
58-
<Description resid="Contoso.TaskpaneButton.Tooltip" />
57+
<Title resid="TaskpaneButton.Label" />
58+
<Description resid="TaskpaneButton.Tooltip" />
5959
</Supertip>
6060
<Icon>
61-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
62-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
63-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
61+
<bt:Image size="16" resid="Icon.16x16" />
62+
<bt:Image size="32" resid="Icon.32x32" />
63+
<bt:Image size="80" resid="Icon.80x80" />
6464
</Icon>
6565
<Action xsi:type="ShowTaskpane">
66-
<SourceLocation resid="Contoso.Taskpane.Url" />
66+
<SourceLocation resid="Taskpane.Url" />
6767
</Action>
6868
</Control>
6969
</Group>
@@ -74,20 +74,20 @@
7474
</Hosts>
7575
<Resources>
7676
<bt:Images>
77-
<bt:Image id="Contoso.tpicon_16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
78-
<bt:Image id="Contoso.tpicon_32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
79-
<bt:Image id="Contoso.tpicon_80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
77+
<bt:Image id="Icon.16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
78+
<bt:Image id="Icon.32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
79+
<bt:Image id="Icon.80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
8080
</bt:Images>
8181
<bt:Urls>
82-
<bt:Url id="Contoso.Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
83-
<bt:Url id="Contoso.Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
82+
<bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
83+
<bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
8484
</bt:Urls>
8585
<bt:ShortStrings>
86-
<bt:String id="Contoso.GroupLabel" DefaultValue="Contoso Add-in"/>
87-
<bt:String id="Contoso.TaskpaneButton.Label" DefaultValue="Show Taskpane"/>
86+
<bt:String id="GroupLabel" DefaultValue="Contoso Add-in"/>
87+
<bt:String id="TaskpaneButton.Label" DefaultValue="Show Taskpane"/>
8888
</bt:ShortStrings>
8989
<bt:LongStrings>
90-
<bt:String id="Contoso.TaskpaneButton.Tooltip" DefaultValue="Opens a pane displaying all available properties."/>
90+
<bt:String id="TaskpaneButton.Tooltip" DefaultValue="Opens a pane displaying all available properties."/>
9191
</bt:LongStrings>
9292
</Resources>
9393
</VersionOverrides>

‎manifest.powerpoint.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@
2424
<Host xsi:type="Presentation">
2525
<DesktopFormFactor>
2626
<GetStarted>
27-
<Title resid="Contoso.GetStarted.Title"/>
28-
<Description resid="Contoso.GetStarted.Description"/>
29-
<LearnMoreUrl resid="Contoso.GetStarted.LearnMoreUrl"/>
27+
<Title resid="GetStarted.Title"/>
28+
<Description resid="GetStarted.Description"/>
29+
<LearnMoreUrl resid="GetStarted.LearnMoreUrl"/>
3030
</GetStarted>
31-
<FunctionFile resid="Contoso.Commands.Url" />
31+
<FunctionFile resid="Commands.Url" />
3232
<ExtensionPoint xsi:type="PrimaryCommandSurface">
3333
<OfficeTab id="TabHome">
34-
<Group id="Contoso.Group1">
35-
<Label resid="Contoso.Group1Label" />
34+
<Group id="CommandsGroup">
35+
<Label resid="CommandsGroup.Label" />
3636
<Icon>
37-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
38-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
39-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
37+
<bt:Image size="16" resid="Icon.16x16" />
38+
<bt:Image size="32" resid="Icon.32x32" />
39+
<bt:Image size="80" resid="Icon.80x80" />
4040
</Icon>
41-
<Control xsi:type="Button" id="Contoso.TaskpaneButton">
42-
<Label resid="Contoso.TaskpaneButton.Label" />
41+
<Control xsi:type="Button" id="TaskpaneButton">
42+
<Label resid="TaskpaneButton.Label" />
4343
<Supertip>
44-
<Title resid="Contoso.TaskpaneButton.Label" />
45-
<Description resid="Contoso.TaskpaneButton.Tooltip" />
44+
<Title resid="TaskpaneButton.Label" />
45+
<Description resid="TaskpaneButton.Tooltip" />
4646
</Supertip>
4747
<Icon>
48-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
49-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
50-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
48+
<bt:Image size="16" resid="Icon.16x16" />
49+
<bt:Image size="32" resid="Icon.32x32" />
50+
<bt:Image size="80" resid="Icon.80x80" />
5151
</Icon>
5252
<Action xsi:type="ShowTaskpane">
5353
<TaskpaneId>ButtonId1</TaskpaneId>
54-
<SourceLocation resid="Contoso.Taskpane.Url" />
54+
<SourceLocation resid="Taskpane.Url" />
5555
</Action>
5656
</Control>
5757
</Group>
@@ -62,23 +62,23 @@
6262
</Hosts>
6363
<Resources>
6464
<bt:Images>
65-
<bt:Image id="Contoso.tpicon_16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
66-
<bt:Image id="Contoso.tpicon_32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
67-
<bt:Image id="Contoso.tpicon_80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
65+
<bt:Image id="Icon.16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
66+
<bt:Image id="Icon.32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
67+
<bt:Image id="Icon.80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
6868
</bt:Images>
6969
<bt:Urls>
70-
<bt:Url id="Contoso.GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
71-
<bt:Url id="Contoso.Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
72-
<bt:Url id="Contoso.Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
70+
<bt:Url id="GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
71+
<bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
72+
<bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
7373
</bt:Urls>
7474
<bt:ShortStrings>
75-
<bt:String id="Contoso.GetStarted.Title" DefaultValue="Get started with your sample add-in!" />
76-
<bt:String id="Contoso.Group1Label" DefaultValue="Commands Group" />
77-
<bt:String id="Contoso.TaskpaneButton.Label" DefaultValue="Show Taskpane" />
75+
<bt:String id="GetStarted.Title" DefaultValue="Get started with your sample add-in!" />
76+
<bt:String id="CommandsGroup.Label" DefaultValue="Commands Group" />
77+
<bt:String id="TaskpaneButton.Label" DefaultValue="Show Taskpane" />
7878
</bt:ShortStrings>
7979
<bt:LongStrings>
80-
<bt:String id="Contoso.GetStarted.Description" DefaultValue="Your sample add-in loaded succesfully. Go to the HOME tab and click the 'Show Taskpane' button to get started." />
81-
<bt:String id="Contoso.TaskpaneButton.Tooltip" DefaultValue="Click to Show a Taskpane" />
80+
<bt:String id="GetStarted.Description" DefaultValue="Your sample add-in loaded succesfully. Go to the HOME tab and click the 'Show Taskpane' button to get started." />
81+
<bt:String id="TaskpaneButton.Tooltip" DefaultValue="Click to Show a Taskpane" />
8282
</bt:LongStrings>
8383
</Resources>
8484
</VersionOverrides>

0 commit comments

Comments
 (0)