Skip to content

Commit 6b1b2f2

Browse files
akrantzakrantz
committed
Merge changes from Office-Addin-TaskPane
2 parents 06584f4 + 7edbe11 commit 6b1b2f2

File tree

4 files changed

+3191
-4569
lines changed

4 files changed

+3191
-4569
lines changed

‎manifest.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,47 +33,47 @@
3333
<AllFormFactors>
3434
<ExtensionPoint xsi:type="CustomFunctions">
3535
<Script>
36-
<SourceLocation resid="Contoso.Functions.Script.Url" />
36+
<SourceLocation resid="Functions.Script.Url" />
3737
</Script>
3838
<Page>
39-
<SourceLocation resid="Contoso.Functions.Page.Url"/>
39+
<SourceLocation resid="Functions.Page.Url"/>
4040
</Page>
4141
<Metadata>
42-
<SourceLocation resid="Contoso.Functions.Metadata.Url" />
42+
<SourceLocation resid="Functions.Metadata.Url" />
4343
</Metadata>
44-
<Namespace resid="Contoso.Functions.Namespace" />
44+
<Namespace resid="Functions.Namespace" />
4545
</ExtensionPoint>
4646
</AllFormFactors>
4747
<DesktopFormFactor>
4848
<GetStarted>
49-
<Title resid="Contoso.GetStarted.Title"/>
50-
<Description resid="Contoso.GetStarted.Description"/>
51-
<LearnMoreUrl resid="Contoso.GetStarted.LearnMoreUrl"/>
49+
<Title resid="GetStarted.Title"/>
50+
<Description resid="GetStarted.Description"/>
51+
<LearnMoreUrl resid="GetStarted.LearnMoreUrl"/>
5252
</GetStarted>
53-
<FunctionFile resid="Contoso.Commands.Url" />
53+
<FunctionFile resid="Commands.Url" />
5454
<ExtensionPoint xsi:type="PrimaryCommandSurface">
5555
<OfficeTab id="TabHome">
56-
<Group id="Contoso.Group1">
57-
<Label resid="Contoso.Group1Label" />
56+
<Group id="CommandsGroup">
57+
<Label resid="CommandsGroup.Label" />
5858
<Icon>
59-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
60-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
61-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
59+
<bt:Image size="16" resid="Icon.16x16" />
60+
<bt:Image size="32" resid="Icon.32x32" />
61+
<bt:Image size="80" resid="Icon.80x80" />
6262
</Icon>
63-
<Control xsi:type="Button" id="Contoso.TaskpaneButton">
64-
<Label resid="Contoso.TaskpaneButton.Label" />
63+
<Control xsi:type="Button" id="TaskpaneButton">
64+
<Label resid="TaskpaneButton.Label" />
6565
<Supertip>
66-
<Title resid="Contoso.TaskpaneButton.Label" />
67-
<Description resid="Contoso.TaskpaneButton.Tooltip" />
66+
<Title resid="TaskpaneButton.Label" />
67+
<Description resid="TaskpaneButton.Tooltip" />
6868
</Supertip>
6969
<Icon>
70-
<bt:Image size="16" resid="Contoso.tpicon_16x16" />
71-
<bt:Image size="32" resid="Contoso.tpicon_32x32" />
72-
<bt:Image size="80" resid="Contoso.tpicon_80x80" />
70+
<bt:Image size="16" resid="Icon.16x16" />
71+
<bt:Image size="32" resid="Icon.32x32" />
72+
<bt:Image size="80" resid="Icon.80x80" />
7373
</Icon>
7474
<Action xsi:type="ShowTaskpane">
7575
<TaskpaneId>ButtonId1</TaskpaneId>
76-
<SourceLocation resid="Contoso.Taskpane.Url" />
76+
<SourceLocation resid="Taskpane.Url" />
7777
</Action>
7878
</Control>
7979
</Group>
@@ -84,27 +84,27 @@
8484
</Hosts>
8585
<Resources>
8686
<bt:Images>
87-
<bt:Image id="Contoso.tpicon_16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
88-
<bt:Image id="Contoso.tpicon_32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
89-
<bt:Image id="Contoso.tpicon_80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
87+
<bt:Image id="Icon.16x16" DefaultValue="https://localhost:3000/assets/icon-16.png"/>
88+
<bt:Image id="Icon.32x32" DefaultValue="https://localhost:3000/assets/icon-32.png"/>
89+
<bt:Image id="Icon.80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
9090
</bt:Images>
9191
<bt:Urls>
92-
<bt:Url id="Contoso.Functions.Script.Url" DefaultValue="https://localhost:3000/dist/functions.js" />
93-
<bt:Url id="Contoso.Functions.Metadata.Url" DefaultValue="https://localhost:3000/dist/functions.json" />
94-
<bt:Url id="Contoso.Functions.Page.Url" DefaultValue="https://localhost:3000/dist/functions.html" />
95-
<bt:Url id="Contoso.GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
96-
<bt:Url id="Contoso.Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
97-
<bt:Url id="Contoso.Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
92+
<bt:Url id="Functions.Script.Url" DefaultValue="https://localhost:3000/dist/functions.js" />
93+
<bt:Url id="Functions.Metadata.Url" DefaultValue="https://localhost:3000/dist/functions.json" />
94+
<bt:Url id="Functions.Page.Url" DefaultValue="https://localhost:3000/dist/functions.html" />
95+
<bt:Url id="GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
96+
<bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
97+
<bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
9898
</bt:Urls>
9999
<bt:ShortStrings>
100-
<bt:String id="Contoso.Functions.Namespace" DefaultValue="CONTOSO" />
101-
<bt:String id="Contoso.GetStarted.Title" DefaultValue="Get started with your sample add-in!" />
102-
<bt:String id="Contoso.Group1Label" DefaultValue="Commands Group" />
103-
<bt:String id="Contoso.TaskpaneButton.Label" DefaultValue="Show Taskpane" />
100+
<bt:String id="Functions.Namespace" DefaultValue="CONTOSO" />
101+
<bt:String id="GetStarted.Title" DefaultValue="Get started with your sample add-in!" />
102+
<bt:String id="CommandsGroup.Label" DefaultValue="Commands Group" />
103+
<bt:String id="TaskpaneButton.Label" DefaultValue="Show Taskpane" />
104104
</bt:ShortStrings>
105105
<bt:LongStrings>
106-
<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." />
107-
<bt:String id="Contoso.TaskpaneButton.Tooltip" DefaultValue="Click to Show a Taskpane" />
106+
<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." />
107+
<bt:String id="TaskpaneButton.Tooltip" DefaultValue="Click to Show a Taskpane" />
108108
</bt:LongStrings>
109109
</Resources>
110110
</VersionOverrides>

0 commit comments

Comments
 (0)