Skip to content

Commit 3f88738

Browse files
committed
Merge branch 'main' into alvinashcraft/main-settings-uris-copilot-personalization
2 parents d8cd038 + f348388 commit 3f88738

File tree

65 files changed

+676
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+676
-198
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8274,6 +8274,11 @@
82748274
"source_path": "uwp/devices-sensors/scan-from-your-app.md",
82758275
"redirect_url": "/windows/apps/develop/devices-sensors/scan-from-your-app",
82768276
"redirect_document_id": false
8277+
},
8278+
{
8279+
"source_path": "hub/dev-home/project-ironsides.md",
8280+
"redirect_url": "windows/dev-home/dev-diagnostics",
8281+
"redirect_document_id": false
82778282
}
82788283
]
82798284
}

hub/apps/develop/feeds/feed-provider-manifest.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ Represents the registration for a single feed.
8585
| **ContentUri** | string | Yes | The URI from which feed content is retrieved. | N/A |
8686
| **Icon** | string | Yes | The package-relative path to an icon image file that is displayed in the Widgets Board. | N/A |
8787
| **WebRequestFilter** | string | No | A web request filter string specifying the set of URLs for which the resource requests will be redirected to the feed provider's implementation of **IFeedResourceProvider**. The pattern is expressed using the format described in [Match Patterns](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Match_patterns). The filter string in the registration must use [Punycode](https://en.wikipedia.org/wiki/Punycode) where necessary. All content types will be redirected when matched so the filter should only resolve to content intended to be obtained through the **IFeedResourceProvider** in the application. | N/A |
88+
| **ExcludedRegions** | string | No | A list of regions where the feed should not be available. Feeds can specify **ExcludedRegions** or **ExclusiveRegions** but must not specify both in a single feed definition. The value of the attribute is a comma separated list of two character region codes.| N/A |
89+
| **ExclusiveRegions** | string | No | A list of the only regions where the feed should be available. Feeds can specify **ExcludedRegions** or **ExclusiveRegions** but must not specify both in single feed definition. The value of the attribute is a comma separated list of two character region codes.| N/A |
8890

8991

9092
You can use localized resources instead of string literals for the UI-facing attribute values. For more information, see [Localize strings in your UI and app package manifest](/windows/uwp/app-resources/localize-strings-ui-manifest).
@@ -101,10 +103,13 @@ The following code example illustrates the usage of the feed package manifest XM
101103
<CreateInstance ClassId="ECB883FD-3755-4E1C-BECA-D3397A3FF15C" />
102104
</Activation>
103105
<Definitions>
104-
<Definition Id="Contoso_Feed" DisplayName="ms-resource:FeedDisplayName" Description="ms-resource:FeedDescription"
106+
<Definition Id="Contoso_Feed"
107+
DisplayName="ms-resource:FeedDisplayName"
108+
Description="ms-resource:FeedDescription"
105109
ContentUri="https://contoso.com/news"
106110
Icon="ms-appx:Images\ContosoFeedIcon.png"
107-
WebRequestFilter="https://contoso.com/*/feed/appResource/*" >
111+
WebRequestFilter="https://contoso.com/*/feed/appResource/*"
112+
ExcludedRegions="FR,DE,IT">
108113
</Definition>
109114
</Definitions>
110115
</FeedProvider>

hub/apps/develop/widgets/widget-provider-manifest.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ Represents the registration for a single widget.
122122
| **Description** | string | Yes | Short description of the widget. | N/A |
123123
| **AllowMultiple** | boolean | No | Set to false if only one instance of this widget is supported. This attribute is optional and the default value is true. | true |
124124
| **IsCustomizable** | boolean | No | Introduced in Windows App SDK 1.4. Set to true if your app supports widget customization. This causes the **Customize widget** button to be displayed in the widget's ellipsis menu. | false |
125+
| **AdditionalInfoUri** | string | No | A URI that can be associated with the widget to be used when the user clicks on the title bar of the widget frame or when clicking the **Powered by** element of its context menu.| N/A |
126+
| **ExcludedRegions** | string | No | A list of regions where the widget should not be available. Widgets can specify **ExcludedRegions** or **ExclusiveRegions** but must not specify both in a single widget definition. The value of the attribute is a comma separated list of two character region codes.| N/A |
127+
| **ExclusiveRegions** | string | No | A list of the only regions where the widget should be available. Widgets can specify **ExcludedRegions** or **ExclusiveRegions** but must not specify both in single widget definition. The value of the attribute is a comma separated list of two character region codes.| N/A |
125128

126129
## Capabilities
127130

@@ -200,6 +203,8 @@ The following code example illustrates the usage of the widget package manifest
200203
Id="Weather_Widget"
201204
DisplayName="Microsoft Weather Widget"
202205
Description="Weather Widget Description"
206+
AdditionalInfoUri="https://contoso.com/widgets/Weather"
207+
ExclusiveRegions="US,UK"
203208
AllowMultiple="true">
204209
<Capabilities>
205210
<Capability>

hub/apps/publish/organizational-licensing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Offline licensing allows organizations to acquire your app on a volume basis, an
5454
Currently, developer accounts located in certain markets are able to offer paid apps for volume acquisition through Microsoft Store for Business.
5555

5656
> [!NOTE]
57-
> In some markets, the price shown for an app in Microsoft Store for Business or Microsoft Store for Education may be different than the price shown to retail customers in the Microsoft Store for the same price tier. Payout of proceeds from organizational purchases works just the same as it does for consumer purchases of your app. For more info, see [Getting paid](/partner-center/marketplace-get-paid) and the [App Developer Agreement](/legal/windows/agreements/app-developer-agreement). For a list of markets where Microsoft Store for Business and Microsoft Store for Education are available, see [Microsoft Store for Business and Microsoft Store for Education overview](/windows/manage/windows-store-for-business-overview#supported-markets).
57+
> In some markets, the price shown for an app in Microsoft Store for Business or Microsoft Store for Education may be different than the price shown to retail customers in the Microsoft Store for the same price tier. Payout of proceeds from organizational purchases works just the same as it does for consumer purchases of your app. For more info, see [Getting paid](/partner-center/marketplace-get-paid) and the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905). For a list of markets where Microsoft Store for Business and Microsoft Store for Education are available, see [Microsoft Store for Business and Microsoft Store for Education overview](/windows/manage/windows-store-for-business-overview#supported-markets).
5858
5959
If your country or region is not listed below, your paid apps currently will not be offered in Microsoft Store for Business and Microsoft Store for Education. If this is the case, the organizational licensing selections you make for your paid apps may be applied at a later time, as we may add support for submissions from additional developer account markets in the future.
6060

hub/apps/publish/partner-center/open-a-developer-account.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ For more details, you can refer to the steps below:
4040
1. Enter the **publisher display name** that you want to use (50 characters or fewer). Select this carefully, as customers will see this name when browsing and will come to know your apps by this name.
4141

4242
> [!NOTE]
43-
> Make sure you have the rights to use the name you enter here. If someone else has trademarked or copyrighted the name you picked, your account could be closed. See [app developer agreement](/legal/windows/agreements/app-developer-agreement) for more info. If someone else is using a publisher display name for which you hold the trademark or other legal right, [contact Microsoft](https://www.microsoft.com/info/cpyrtInfrg.html).
43+
> Make sure you have the rights to use the name you enter here. If someone else has trademarked or copyrighted the name you picked, your account could be closed. See [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905) for more info. If someone else is using a publisher display name for which you hold the trademark or other legal right, [contact Microsoft](https://www.microsoft.com/info/cpyrtInfrg.html).
4444
4545
1. Enter the **contact info** you want to use for your developer account.
4646

4747
> [!NOTE]
4848
> We'll use this info to contact you about account-related matters. For example, you'll receive an email confirmation after you complete your registration. After that, we'll send messages when we pay you or if you need to fix something with your account. We may also send informational emails as described earlier, unless you opt out of receiving non-transactional emails.
4949
50-
1. Then, read and accept the terms and conditions of the [app developer agreement](/legal/windows/agreements/app-developer-agreement).
50+
1. Then, read and accept the terms and conditions of the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905).
5151

5252
1. Select **Accept and Continue** to move on to the **Payment** section.
5353

@@ -96,11 +96,11 @@ For more details, you can refer to the steps below:
9696
1. Enter the **publisher display name** that you want to use (50 characters or fewer). Select this carefully, as customers will see this name when browsing and will come to know your apps by this name. Be sure to use your organization's registered business name or trade name. If you enter a name that someone else has already selected, or if someone else has the rights to use that name, we won't permit you to use it.
9797

9898
> [!NOTE]
99-
> Make sure you have the rights to use the name you enter here. If someone else has trademarked or copyrighted the name you picked, your account could be closed. See [app developer agreement](/legal/windows/agreements/app-developer-agreement) for more info. If someone else is using a publisher display name for which you hold the trademark or other legal right, [contact Microsoft](https://www.microsoft.com/info/cpyrtInfrg.html).
99+
> Make sure you have the rights to use the name you enter here. If someone else has trademarked or copyrighted the name you picked, your account could be closed. See [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905) for more info. If someone else is using a publisher display name for which you hold the trademark or other legal right, [contact Microsoft](https://www.microsoft.com/info/cpyrtInfrg.html).
100100
101101
1. Upload **a legal document** with your company address and name details such as formation documents, government issued letter/license etc.
102102

103-
1. Then, read and accept the terms and conditions of the [app developer agreement](/legal/windows/agreements/app-developer-agreement).
103+
1. Then, read and accept the terms and conditions of the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905).
104104

105105
1. Select **Accept and Continue** to move on to the **Payment** section.
106106

hub/apps/publish/publish-your-app/add-on/market-selection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ You can choose to list your app (or add-on) in one or more of the following mark
401401

402402
## Price considerations for specific markets
403403

404-
Payment methods such as gift cards and mobile operator billing can help increase sales of paid apps and in-app purchase items. Due to the higher costs to enable such payment methods, a Commerce Expansion Adjustment is added to the Store Fee deducted from Net Receipts to calculate the App Proceeds payable for paid apps and in-app purchase transactions in the countries/regions and using the payment methods in the tables below. You may want to consider if the Commerce Expansion Adjustment applies in a country/region where your app is available and factor that into your market pricing strategy. Details about the Commerce Expansion Adjustment can be found in the [App Developer Agreement](/legal/windows/agreements/app-developer-agreement).
404+
Payment methods such as gift cards and mobile operator billing can help increase sales of paid apps and in-app purchase items. Due to the higher costs to enable such payment methods, a Commerce Expansion Adjustment is added to the Store Fee deducted from Net Receipts to calculate the App Proceeds payable for paid apps and in-app purchase transactions in the countries/regions and using the payment methods in the tables below. You may want to consider if the Commerce Expansion Adjustment applies in a country/region where your app is available and factor that into your market pricing strategy. Details about the Commerce Expansion Adjustment can be found in the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905).
405405

406406
The Commerce Expansion Adjustment will be applied to all transactions processed for the specified Country/Region and Payment Methods as of the Effective Date. This information will be updated monthly; new countries/regions and payment methods will be listed within thirty (30) days after the Commerce Expansion Adjustment takes effect for that country/region and payment method.
407407

hub/apps/publish/publish-your-app/add-on/product-declarations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The following sections describe some of the declarations and what you need to co
1616

1717
1. If your app is using Microsoft Commerce, do not tick this box.
1818
2. If your app does not use Microsoft Commerce, tick this box.
19-
3. Per the [App Developer Agreement](/legal/windows/agreements/app-developer-agreement), apps that were created and submitted prior to June 29, 2015, could continue to offer in-app purchasing functionality without using Microsoft's commerce engine, so long as the purchase functionality complies with the [Microsoft Store Policies](../../store-policies.md#108-financial-transactions). If this applies to your app, you must check this box.
19+
3. Per the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905), apps that were created and submitted prior to June 29, 2015, could continue to offer in-app purchasing functionality without using Microsoft's commerce engine, so long as the purchase functionality complies with the [Microsoft Store Policies](../../store-policies.md#108-financial-transactions). If this applies to your app, you must check this box.
2020

2121
## This app has been tested to meet accessibility guidelines
2222

hub/apps/publish/publish-your-app/add-on/resolve-submission-errors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Review this list to help avoid issues that frequently prevent apps from getting
4747

4848
- [Provide any necessary info](./manage-submission-options.md#notes-for-certification) required to use your app, such as the user name and password for a test account if your app requires users to log in to a service, or any steps required to access hidden or locked features.
4949

50-
- Include a [privacy policy URL](./support-info.md#privacy-policy-url) if your app requires one; for example, if your app accesses any kind of personal information in any way or is otherwise required by law. To help determine if your app requires a privacy policy, review the [App Developer Agreement](/legal/windows/agreements/app-developer-agreement) and the [Microsoft Store Policies](../../store-policies.md).
50+
- Include a [privacy policy URL](./support-info.md#privacy-policy-url) if your app requires one; for example, if your app accesses any kind of personal information in any way or is otherwise required by law. To help determine if your app requires a privacy policy, review the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905) and the [Microsoft Store Policies](../../store-policies.md).
5151

5252
- Make sure that your app's description clearly represents what your app does. For help, see our guidance on [writing a great app description](./write-great-app-description.md).
5353

hub/apps/publish/publish-your-app/add-on/support-info.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ In this section, you must indicate whether or not your app accesses, collects, o
1919
> [!NOTE]
2020
> If we detect that your packages declare [capabilities](/windows/uwp/packaging/app-capability-declarations) that could allow personal information to be accessed, transmitted, or collected, we will mark this question as **Yes**, and you will be required to enter a privacy policy URL.
2121
22-
To help you determine if your app requires a privacy policy, review the [App Developer Agreement](/legal/windows/agreements/app-developer-agreement) and the [Microsoft Store Policies](../../store-policies.md#105-personal-information).
22+
To help you determine if your app requires a privacy policy, review the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905) and the [Microsoft Store Policies](../../store-policies.md#105-personal-information).
2323

2424
> [!NOTE]
2525
> Microsoft doesn't provide a default privacy policy for your app. Likewise, your app is not covered by any Microsoft privacy policy.

hub/apps/publish/publish-your-app/msi/app-certification-process.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ It is highly recommended that your EXE/MSI app and the Portable Executable (PE)
6262

6363
### Privacy policy
6464

65-
Include a valid privacy policy URL if your app requires one; for example, if your app accesses any kind of personal information in any way or is otherwise required by law. To help determine if your app requires a privacy policy, review the [App Developer Agreement](/legal/windows/agreements/app-developer-agreement) and the [Microsoft Store Policies](../../store-policies.md#105-personal-information).
65+
Include a valid privacy policy URL if your app requires one; for example, if your app accesses any kind of personal information in any way or is otherwise required by law. To help determine if your app requires a privacy policy, review the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905) and the [Microsoft Store Policies](../../store-policies.md#105-personal-information).
6666

6767
### Additional tests
6868

@@ -78,7 +78,7 @@ Review this list to help avoid issues that frequently prevent apps from getting
7878
- Ensure that your app does not crash without network connectivity. Even if a connection is required to use your app, it needs to perform appropriately when no connection is present.
7979
- Provide any necessary info required to use your app, such as the username and password for a test account if your app requires users to log in to a service, or any steps required to access hidden or locked features.
8080
- Configure your app's installer to provide your app’s information such as ProductName, Publisher Name, Default Language, Version info (as applicable) in places where customers expect to find such information such as ‘Add/Remove Programs’ in Windows. This information is part of your app’s installer package. See [setting installer properties](/windows/win32/msi/property-reference#product-information-properties) for more details on how to set properties for your Windows installer
81-
- Include a privacy policy URL if your app requires one; for example, if your app accesses any kind of personal information in any way or is otherwise required by law. To help determine if your app requires a privacy policy, review the [App Developer Agreement](/legal/windows/agreements/app-developer-agreement) and the [Microsoft Store Policies](../../store-policies.md#105-personal-information).
81+
- Include a privacy policy URL if your app requires one; for example, if your app accesses any kind of personal information in any way or is otherwise required by law. To help determine if your app requires a privacy policy, review the [App Developer Agreement](https://go.microsoft.com/fwlink/?linkid=528905) and the [Microsoft Store Policies](../../store-policies.md#105-personal-information).
8282
- Make sure that your app's description clearly represents what it does. For help, see our guidance on [writing a great app description](./write-great-app-description.md).
8383
- Do not declare your app as accessible unless you have specifically engineered and tested it for accessibility scenarios.
8484
- Review the [Microsoft Store Policies](../../store-policies.md) to ensure your app meets all the requirements listed there.

0 commit comments

Comments
 (0)