Skip to content

Commit 6a68f2f

Browse files
committed
Merged main into live
2 parents 373c68a + 1d8b7eb commit 6a68f2f

18 files changed

+39
-39
lines changed

hub/apps/desktop/modernize/desktop-to-uwp-extensions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -910,16 +910,16 @@ To register your context menu handler, follow these instructions.
910910
1. In your desktop application, implement a [context menu handler](/windows/desktop/shell/context-menu-handlers) by implementing the [IExplorerCommand](/windows/desktop/api/shobjidl_core/nn-shobjidl_core-iexplorercommand) or [IExplorerCommandState](/windows/desktop/api/shobjidl_core/nn-shobjidl_core-iexplorercommandstate) interface. For a sample, see the [ExplorerCommandVerb](https://github.com/microsoft/Windows-classic-samples/tree/master/Samples/Win7Samples/winui/shell/appshellintegration/ExplorerCommandVerb) code sample. Make sure that you define a class GUID for each of your implementation objects. For example, the following code defines a class ID for an implementation of [IExplorerCommand](/windows/desktop/api/shobjidl_core/nn-shobjidl_core-iexplorercommand).
911911

912912
```cpp
913-
class __declspec(uuid("d0c8bceb-28eb-49ae-bc68-454ae84d6264")) CExplorerCommandVerb;
913+
class __declspec(uuid("00001111-aaaa-2222-bbbb-3333cccc4444")) CExplorerCommandVerb;
914914
```
915915

916916
2. In your package manifest, specify a [com:ComServer](/uwp/schemas/appxpackage/uapmanifestschema/element-com-comserver) application extension that registers a COM surrogate server with the class ID of your context menu handler implementation.
917917

918918
```xml
919919
<com:Extension Category="windows.comServer">
920920
<com:ComServer>
921-
<com:SurrogateServer AppId="d0c8bceb-28eb-49ae-bc68-454ae84d6264" DisplayName="ContosoHandler">
922-
<com:Class Id="d0c8bceb-28eb-49ae-bc68-454ae84d6264" Path="ExplorerCommandVerb.dll" ThreadingModel="STA"/>
921+
<com:SurrogateServer AppId="00001111-aaaa-2222-bbbb-3333cccc4444" DisplayName="ContosoHandler">
922+
<com:Class Id="00001111-aaaa-2222-bbbb-3333cccc4444" Path="ExplorerCommandVerb.dll" ThreadingModel="STA"/>
923923
</com:SurrogateServer>
924924
</com:ComServer>
925925
</com:Extension>
@@ -931,7 +931,7 @@ To register your context menu handler, follow these instructions.
931931
<desktop4:Extension Category="windows.fileExplorerContextMenus">
932932
<desktop4:FileExplorerContextMenus>
933933
<desktop4:ItemType Type=".rar">
934-
<desktop4:Verb Id="Command1" Clsid="d0c8bceb-28eb-49ae-bc68-454ae84d6264" />
934+
<desktop4:Verb Id="Command1" Clsid="00001111-aaaa-2222-bbbb-3333cccc4444" />
935935
</desktop4:ItemType>
936936
</desktop4:FileExplorerContextMenus>
937937
</desktop4:Extension>
@@ -950,15 +950,15 @@ To register your context menu handler, follow these instructions.
950950
<Extensions>
951951
<com:Extension Category="windows.comServer">
952952
<com:ComServer>
953-
<com:SurrogateServer AppId="d0c8bceb-28eb-49ae-bc68-454ae84d6264" DisplayName="ContosoHandler">
954-
<com:Class Id="d0c8bceb-28eb-49ae-bc68-454ae84d6264" Path="ExplorerCommandVerb.dll" ThreadingModel="STA"/>
953+
<com:SurrogateServer AppId="00001111-aaaa-2222-bbbb-3333cccc4444" DisplayName="ContosoHandler">
954+
<com:Class Id="00001111-aaaa-2222-bbbb-3333cccc4444" Path="ExplorerCommandVerb.dll" ThreadingModel="STA"/>
955955
</com:SurrogateServer>
956956
</com:ComServer>
957957
</com:Extension>
958958
<desktop4:Extension Category="windows.fileExplorerContextMenus">
959959
<desktop4:FileExplorerContextMenus>
960960
<desktop4:ItemType Type=".contoso">
961-
<desktop4:Verb Id="Command1" Clsid="d0c8bceb-28eb-49ae-bc68-454ae84d6264" />
961+
<desktop4:Verb Id="Command1" Clsid="00001111-aaaa-2222-bbbb-3333cccc4444" />
962962
</desktop4:ItemType>
963963
</desktop4:FileExplorerContextMenus>
964964
</desktop4:Extension>

hub/apps/publish/store-submission-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1771,7 +1771,7 @@ namespace Win32SubmissionApiCSharpSample
17711771
{
17721772
/// <summary>
17731773
/// Client Id of your Azure Active Directory app.
1774-
/// Example" ba3c223b-03ab-4a44-aa32-38aa10c27e32
1774+
/// Example" 00001111-aaaa-2222-bbbb-3333cccc4444
17751775
/// </summary>
17761776
public string ClientId { get; set; }
17771777

@@ -2178,7 +2178,7 @@ namespace Win32SubmissionApiCSharpSample
21782178
/// </summary>
21792179
/// <param name="tokenEndpoint">Token endpoint to which the request is to be made. Specific to your
21802180
/// Azure Active Directory app. Example: https://login.microsoftonline.com/d454d300-128e-2d81-334a-27d9b2baf002/oauth2/v2.0/token </param>
2181-
/// <param name="clientId">Client Id of your Azure Active Directory app. Example" ba3c223b-03ab-4a44-aa32-38aa10c27e32</param>
2181+
/// <param name="clientId">Client Id of your Azure Active Directory app. Example" 00001111-aaaa-2222-bbbb-3333cccc4444</param>
21822182
/// <param name="clientSecret">Client secret of your Azure Active Directory app</param>
21832183
/// <param name="scope">Scope. If not provided, default one is used for the production API endpoint.</param>
21842184
/// <returns>Autorization token. Prepend it with "Bearer: " and pass it in the request header as the

uwp/monetize/adcontrol-in-html-5-and-javascript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ For a complete sample project that demonstrates how to add banner ads to a JavaS
5858
``` HTML
5959
<div id="myAd" style="position: absolute; top: 50px; left: 0px; width: 300px; height: 250px; z-index: 1"
6060
data-win-control="MicrosoftNSJS.Advertising.AdControl"
61-
data-win-options="{applicationId: '3f83fe91-d6be-434d-a0ae-7351c5a997f1', adUnitId: 'test'}">
61+
data-win-options="{applicationId: '00001111-aaaa-2222-bbbb-3333cccc4444', adUnitId: 'test'}">
6262
</div>
6363
```
6464

@@ -85,7 +85,7 @@ The following example shows the complete index.html for a simple app.
8585
<body>
8686
<div id="myAd" style="position: absolute; top: 50px; left: 0px; width: 300px; height: 250px; z-index: 1"
8787
data-win-control="MicrosoftNSJS.Advertising.AdControl"
88-
data-win-options="{applicationId: '3f83fe91-d6be-434d-a0ae-7351c5a997f1', adUnitId: 'test'}">
88+
data-win-options="{applicationId: '00001111-aaaa-2222-bbbb-3333cccc4444', adUnitId: 'test'}">
8989
</div>
9090
<p>Content goes here</p>
9191
</body>

uwp/monetize/adcontrol-in-xaml-and--net.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ This walkthrough shows how to use the [AdControl](/uwp/api/microsoft.advertising
8080

8181
``` xml
8282
<Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
83-
<UI:AdControl ApplicationId="3f83fe91-d6be-434d-a0ae-7351c5a997f1"
83+
<UI:AdControl ApplicationId="00001111-aaaa-2222-bbbb-3333cccc4444"
8484
AdUnitId="test"
8585
HorizontalAlignment="Left"
8686
Height="250"
@@ -102,7 +102,7 @@ This walkthrough shows how to use the [AdControl](/uwp/api/microsoft.advertising
102102
xmlns:UI="using:Microsoft.Advertising.WinRT.UI"
103103
mc:Ignorable="d">
104104
<Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
105-
<UI:AdControl ApplicationId="3f83fe91-d6be-434d-a0ae-7351c5a997f1"
105+
<UI:AdControl ApplicationId="00001111-aaaa-2222-bbbb-3333cccc4444"
106106
AdUnitId="test"
107107
HorizontalAlignment="Left"
108108
Height="250"

uwp/monetize/download-the-cab-file-for-an-error-in-your-desktop-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To use this method, you need to first do the following:
5151
The following example demonstrates how to download a CAB file using this method. Replace the *applicationId* and *cabIdHash* parameters with the appropriate values for your desktop application.
5252

5353
```syntax
54-
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/desktop/cabdownload?applicationId=10238467886765136388&cabIdHash=54ffb83a-e159-41d2-8158-f36f306cc01e HTTP/1.1
54+
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/desktop/cabdownload?applicationId=10238467886765136388&cabIdHash=00001111-aaaa-2222-bbbb-3333cccc4444 HTTP/1.1
5555
Authorization: Bearer <your access token>
5656
```
5757

uwp/monetize/error-handling-in-javascript-walkthrough.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ These examples assume that you have a JavaScript app that contains an **AdContro
1818
``` HTML
1919
<div id="myAd" style="position: absolute; top: 53px; left: 0px; width: 300px; height: 250px; z-index: 1"
2020
data-win-control="MicrosoftNSJS.Advertising.AdControl"
21-
data-win-options="{applicationId: '3f83fe91-d6be-434d-a0ae-7351c5a997f1', adUnitId: 'test'}">
21+
data-win-options="{applicationId: '00001111-aaaa-2222-bbbb-3333cccc4444', adUnitId: 'test'}">
2222
</div>
2323
```
2424
Following the **adUnitId** attribute, add the value for the **onErrorOccurred** event.
2525
``` HTML
2626
<div id="myAd" style="position: absolute; top: 53px; left: 0px; width: 300px; height: 250px; z-index: 1"
2727
data-win-control="MicrosoftNSJS.Advertising.AdControl"
28-
data-win-options="{applicationId: '3f83fe91-d6be-434d-a0ae-7351c5a997f1', adUnitId: 'test', onErrorOccurred: errorLogger}">
28+
data-win-options="{applicationId: '00001111-aaaa-2222-bbbb-3333cccc4444', adUnitId: 'test', onErrorOccurred: errorLogger}">
2929
</div>
3030
```
3131

uwp/monetize/error-handling-in-xamlc-walkthrough.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ These examples assume that you have a XAML/C# app that contains an **AdControl**
1919
1. In your MainPage.xaml file, locate the definition for the **AdControl**. That code looks like this.
2020
``` xml
2121
<UI:AdControl
22-
ApplicationId="3f83fe91-d6be-434d-a0ae-7351c5a997f1"
22+
ApplicationId="00001111-aaaa-2222-bbbb-3333cccc4444"
2323
AdUnitId="test"
2424
HorizontalAlignment="Left"
2525
Height="250"
@@ -31,7 +31,7 @@ These examples assume that you have a XAML/C# app that contains an **AdControl**
3131
2. After the **Width** property, but before the closing tag, assign a name of an error event handler to the [ErrorOccurred](/uwp/api/microsoft.advertising.winrt.ui.adcontrol.erroroccurred) event. In this walkthrough, the name of the error event handler is **OnAdError**.
3232
``` xml
3333
<UI:AdControl
34-
ApplicationId="3f83fe91-d6be-434d-a0ae-7351c5a997f1"
34+
ApplicationId="00001111-aaaa-2222-bbbb-3333cccc4444"
3535
AdUnitId="test"
3636
HorizontalAlignment="Left"
3737
Height="250"
@@ -67,7 +67,7 @@ These examples assume that you have a XAML/C# app that contains an **AdControl**
6767

6868
4. Build and run the project. After the app is running, you will see a message similar to the one below in the **Output** window of Visual Studio.
6969
```json
70-
AdControl error (): MicrosoftAdvertising.Shared.AdException: all ad requests must use the same application ID within a single application (0, d25517cb-12d4-4699-8bdc-52040c712cab) ErrorCode: ClientConfiguration
70+
AdControl error (): MicrosoftAdvertising.Shared.AdException: all ad requests must use the same application ID within a single application (0, 11112222-bbbb-3333-cccc-4444dddd5555) ErrorCode: ClientConfiguration
7171
```
7272

7373
## Related topics

uwp/monetize/error-handling-with-advertising-libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Here is an example that assigns an event handler named **errorLogger** to the **
6060
``` html
6161
<div id="myAd" style="position: absolute; top: 53px; left: 0px; width: 250px; height: 250px; z-index: 1"
6262
data-win-control="MicrosoftNSJS.Advertising.AdControl"
63-
data-win-options="{applicationId: '3f83fe91-d6be-434d-a0ae-7351c5a997f1', adUnitId: 'test', onErrorOccurred: errorLogger}">
63+
data-win-options="{applicationId: '00001111-aaaa-2222-bbbb-3333cccc4444', adUnitId: 'test', onErrorOccurred: errorLogger}">
6464
</div>
6565
```
6666

uwp/monetize/get-details-for-an-error-in-your-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ To use this method, you need to first do the following:
5858
The following examples demonstrate several requests for getting detailed error data. Replace the *applicationId* value with the Store ID for your app.
5959

6060
```syntax
61-
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/failuredetails?applicationId=9NBLGGGZ5QDR&failureHash=012e33e3-dbc9-b12f-c124-9d9810f05d8b&startDate=2016-11-05&endDate=2016-11-06&top=10&skip=0 HTTP/1.1
61+
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/failuredetails?applicationId=9NBLGGGZ5QDR&failureHash=00001111-aaaa-2222-bbbb-3333cccc4444&startDate=2016-11-05&endDate=2016-11-06&top=10&skip=0 HTTP/1.1
6262
Authorization: Bearer <your access token>
6363

64-
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/failuredetails?applicationId=9NBLGGGZ5QDR&failureHash=012e33e3-dbc9-b12f-c124-9d9810f05d8b&startDate=2016-11-05&endDate=2016-11-06&top=10&skip=0&filter=market eq 'US' and deviceType eq 'Windows.Desktop' HTTP/1.1
64+
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/failuredetails?applicationId=9NBLGGGZ5QDR&failureHash=00001111-aaaa-2222-bbbb-3333cccc4444&startDate=2016-11-05&endDate=2016-11-06&top=10&skip=0&filter=market eq 'US' and deviceType eq 'Windows.Desktop' HTTP/1.1
6565
Authorization: Bearer <your access token>
6666
```
6767

uwp/monetize/get-details-for-an-error-in-your-desktop-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ To use this method, you need to first do the following:
5757
The following examples demonstrate several requests for getting detailed error data. Replace the *applicationId* value with the product ID for your desktop application.
5858

5959
```syntax
60-
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/desktop/failuredetails?applicationId=10238467886765136388&failureHash=012e33e3-dbc9-b12f-c124-9d9810f05d8b&startDate=2016-11-05&endDate=2016-11-06&top=10&skip=0 HTTP/1.1
60+
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/desktop/failuredetails?applicationId=10238467886765136388&failureHash=00001111-aaaa-2222-bbbb-3333cccc4444&startDate=2016-11-05&endDate=2016-11-06&top=10&skip=0 HTTP/1.1
6161
Authorization: Bearer <your access token>
6262

63-
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/desktop/failuredetails?applicationId=10238467886765136388&failureHash=012e33e3-dbc9-b12f-c124-9d9810f05d8b&startDate=2016-11-05&endDate=2016-11-06&top=10&skip=0&filter=market eq 'US' and deviceType eq 'PC' HTTP/1.1
63+
GET https://manage.devcenter.microsoft.com/v1.0/my/analytics/desktop/failuredetails?applicationId=10238467886765136388&failureHash=00001111-aaaa-2222-bbbb-3333cccc4444&startDate=2016-11-05&endDate=2016-11-06&top=10&skip=0&filter=market eq 'US' and deviceType eq 'PC' HTTP/1.1
6464
Authorization: Bearer <your access token>
6565
```
6666

0 commit comments

Comments
 (0)