Skip to content

Commit a88b08b

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 368b350 + c83c6b2 commit a88b08b

191 files changed

Lines changed: 4563 additions & 1188 deletions

File tree

Some content is hidden

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

articles/app-service/configure-ssl-certificate-in-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom:
1717

1818
[!INCLUDE [app-service-managed-certificate](./includes/managed-certs/managed-certs-note.md)]
1919

20-
In your application code, you can access the [public or private certificates that you add to Azure App Service](configure-ssl-certificate.md). Your app code might act as a client and access an external service that requires certificate authentication. It might also need to perform cryptographic tasks. This article shows how to use public or private certificates in your application code.
20+
In your application code, you can access both [public key certificates and certificates that contain a private key that you add to Azure App Service.](configure-ssl-certificate.md). Your app code might act as a client and access an external service that requires certificate authentication. It might also need to perform cryptographic tasks. This article shows how to use public or private certificates in your application code.
2121

2222
This approach to using certificates in your code makes use of the Transport Layer Security (TLS) functionality in App Service, which requires your app to be in the Basic tier or higher. If your app is in the Free or Shared tier, you can [include the certificate file in your app repository](#load-a-certificate-from-a-file).
2323

articles/app-service/overview-hosting-plans.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ Except for the Free tier, an App Service plan carries a charge on the compute re
7070

7171
- **Shared tier**: Each app receives a quota of CPU minutes, so *each app* is charged for the CPU quota.
7272
- **Dedicated compute tiers (Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4)**: The App Service plan defines the number of VM instances that the apps are scaled to, so *each VM instance* in the App Service plan is charged. These VM instances are charged the same, regardless of how many apps are running on them. To avoid unexpected charges, see [Delete an App Service plan](app-service-plan-manage.md#delete-an-app-service-plan).
73+
74+
> [!NOTE]
75+
> In dedicated compute tiers, the VM resources are **dedicated to your App Service plan and are not shared with other customers**.
76+
> However, **any apps you place inside the same App Service plan share those dedicated resources with each other**.
77+
> This means compute is dedicated at the **plan level**, not the **per-app level**.
78+
> To isolate compute per app, create a separate App Service plan.
79+
7380
- **IsolatedV2 tier**: The App Service Environment defines the number of isolated workers that run your apps, and *each worker* is charged.
7481

7582
You aren't charged for using the App Service features that are available to you. These features include configuring custom domains, TLS/SSL certificates, deployment slots, and backups. The exceptions are:

articles/artifact-signing/faq.yml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,22 @@ sections:
3434
To register the Microsoft.CodeSigning app, go to the subscription **Resource providers** pane as shown in this example:
3535
3636
:::image type="content" source="media/artifact-signing-resource-provider.png" alt-text="Screenshot of registering the Microsoft.CodeSigning resource provider." lightbox="media/artifact-signing-resource-provider.png":::
37+
- question: What if I'm unable to register Microsoft.CodeSigning as a resource provider?
38+
answer: |
39+
The Microsoft.CodeSigning resource provider isn't supported on Free or Trial Azure subscriptions.. A paid Azure subscription is required to register the provider.
3740
- question: What is the cost of using Artifact Signing?
3841
answer: |
3942
- For pricing information, see [Artifact Signing pricing](https://azure.microsoft.com/pricing/details/artifact-signing/).
4043
- question: What are my support options when I set up Artifact Signing?
4144
answer: |
42-
- You can create a support ticket in the Azure portal to get Azure support. Also, you can post a question or search for related questions on Microsoft Q&A (use the tag **artifact-signing**) or [Stack Overflow](https://stackoverflow.com/questions/tagged/trusted-signing) (use the tag **trusted-signing**).
45+
- You can create a support ticket in the Azure portal to get Azure support. Also, you can post a question or search for related questions on Microsoft Q&A (use the tag **Artifact Signing**) or [Stack Overflow](https://stackoverflow.com/questions/tagged/trusted-signing) (use the tag **trusted-signing**).
4346
- name: Identity validation
4447
questions:
4548
- question: What if I need to create another identity validation for the same organization with a different primary email address?
4649
answer: For cases where identity validation exists with a primary email address and another identity valiadation request is required, contact support to continue onboarding.
47-
- question: What if my country/region is not listed in country/region drop down on the Identity Validation page?
50+
- question: What if my country/region isn't listed in country/region drop down on the Identity Validation page?
4851
answer: |
49-
- For Public Trust certificates, Artifact Signing is currently available to organizations in the USA, Canada, the European Union, and the United Kingdom, as well as individual developers in the USA and Canada. This limitation is not applicable to Private Trust certificates.
52+
- For Public Trust certificates, Artifact Signing is currently available to organizations in the USA, Canada, the European Union, and the United Kingdom, as well as individual developers in the USA and Canada. This limitation isn't applicable to Private Trust certificates.
5053
- question: What if my Artifact Signing subject name is different from the name in my certificate and my MSIX package name is different now?
5154
answer: |
5255
- For Windows app MSIX packages, follow the guidance in [MSIX persistent identity](/windows/msix/package/persistent-identity).
@@ -63,17 +66,17 @@ sections:
6366
answer: |
6467
- Ensure that you didn't miss an email verification link that was sent to the primary email address you entered when you created your identity validation request. The link expires after seven days. If you overlooked the email or if you didn't select the link in the email within seven days, create a new identity validation request.
6568
- If identity validation fails, but not because of a missed email verification, the Microsoft validation team wasn't able to make a determination about your request based on the information that you provided. Even if you provide more documentation when we request it, if we can't validate the information, we can't onboard you to Artifact Signing. In this scenario, we recommend that you delete your Artifact Signing account so that you aren't billed for unused resources.
66-
- In cases where additional documents were required, you've exhausted all 3 attempts. Therefore, we cannot proceed further with the onboarding.
69+
- In cases where additional documents were required, you've exhausted all 3 attempts. Therefore, we can't proceed further with the onboarding.
6770
- question: What if I need assistance with identity validation?
6871
answer: |
6972
- For questions about identity validation in Artifact Signing, contact us via Azure Support or by using Microsoft Q&A (use the tag **artifact-signing**).
70-
- Note: creating additional identity validation requests for the same entity that is in progress does not help. Identity Validation requests cannot be expedited.
73+
- Note: creating additional identity validation requests for the same entity that is in progress doesn't help. Identity Validation requests can't be expedited.
7174
- question: What if email validation link has expired?
7275
answer: |
73-
- If you missed to click on the email verification within 7 days, you need to start a new identity validation request. A new link cannot be resent on the same request.
76+
- If you missed to click on the email verification within 7 days, you need to start a new identity validation request. A new link can't be resent on the same request.
7477
- question: What if email validation says "Failed" and you think you never received the email validation link?
7578
answer: |
76-
- Create another identity validation request. Ensure that the email address used is not a distribution list and the email address can receive links from external email addresses.
79+
- Create another identity validation request. Ensure that the email address used isn't a distribution list and the email address can receive links from external email addresses.
7780
- question: Where can I find Identity Validation Id?
7881
answer: |
7982
- On Identity Validation page, click on the Identity Validation you intend to use. The Identity Validation Id will be shown as "Id" in the details pane that opens.
@@ -84,9 +87,9 @@ sections:
8487
- question: For Individual identity validation, what if I don’t have an address on a bank statement or utility bill?
8588
answer: |
8689
- Be sure to use a government-issued ID with an address on it, to successfully go through the process.
87-
- question: For Individual identity validation, I see an error - "You do not have permission to access this page".
90+
- question: For Individual identity validation, I see an error - "You don't have permission to access this page".
8891
answer: |
89-
- If you see the error, it is because the email address entered in the individual identity validation request is different from the one being used to sign in to access the identity validation link. Make sure both the email addresses match.
92+
- If you see the error, it's because the email address entered in the individual identity validation request is different from the one being used to sign in to access the identity validation link. Make sure both the email addresses match.
9093
:::image type="content" source="media/artifact-signing-indie-validation-email-mismatch.png" alt-text="Screenshot of email mismatch when access link to verify individual developer." lightbox="media/artifact-signing-indie-validation-email-mismatch.png":::
9194
- name: Certificate profiles
9295
questions:
@@ -95,7 +98,7 @@ sections:
9598
- For Windows app MSIX packages, follow the guidance in [MSIX persistent identity](/windows/msix/package/persistent-identity).
9699
- question: Does deleting a certificate profile revoke the certificates?
97100
answer: |
98-
- Deleting a certificate profile does not revoke any previously issued certificates or invalidate their signatures; they remain valid.
101+
- Deleting a certificate profile doesn't revoke any previously issued certificates or invalidate their signatures; they remain valid.
99102
- question: Can I add OU field to Public Trust or Public Trust Test or VBS enclave certificate profile?
100103
answer: |
101104
- No. OU is only available for Private Trust and Private Trust CI Policy certificates.
@@ -161,7 +164,7 @@ sections:
161164
Currently, Artifact Signing resources can't be migrated across subscriptions or tenants or resource groups or resources. If you want to make any change to your tenant ID or subscription ID, you must create all your Artifact Signing resources again.
162165
- question: Does Artifact Signing issue EV certificates?
163166
answer: |
164-
No, Artifact Signing doesn't issue Extended Validation (EV) certificates. There is no plan to issue EV certificates in the future.
167+
No, Artifact Signing doesn't issue Extended Validation (EV) certificates. There's no plan to issue EV certificates in the future.
165168
- question: Why does SignTool keep looping when it signs MSIX packages?
166169
answer: |
167170
Looping multiple times is expected in MSIX signing because each application file and manifest file inside the package is signed.
@@ -178,7 +181,7 @@ sections:
178181
| Error code (-2147024885/0x8007000b) | For MSIX signing, this error indicates that the publisher in the manifest file doesn't match the certificate subject. Check the publisher that's listed in the manifest file. |
179182
| Error code (-2147467259/0x80004005) | If you use Service Principal + certificate based authentication, check your Environment Variables listed under the table for ["Service principal with certificate"](https://learn.microsoft.com/dotnet/api/azure.identity.environmentcredential?view=azure-dotnet).|
180183
| No error codes, SignTool silently fails | Ensure that the relevant .NET runtime version is installed. |
181-
| `Azure.Identity.CredentialUnavailableException` | You might see this error in [environments outside Azure](https://github.com/Azure/azure-sdk-for-net/issues/29471). If you are working outside of Azure, we recommend that you add "exclude ManagedIdentity" to your manifest file. |
184+
| `Azure.Identity.CredentialUnavailableException` | You might see this error in [environments outside Azure](https://github.com/Azure/azure-sdk-for-net/issues/29471). If you're working outside of Azure, we recommend that you add "exclude ManagedIdentity" to your manifest file. |
182185
| 403 | - Check the status of your Azure subscription should be "Registered". <br> - Check the identity trying to sign the file has Artifact Signing Certificate Profile Signer role. <br> - Check the Artifact Signing account name and the Artifact Signing certificate profile name in your *metadata.json* file. <br> - Check the dlib and dlib path. <br> - Install C++ Redistributables from https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170. <br> - Check your .NET version, dlib version, and Windows SDK version. <br> - Check if the corresponding identity validation has a status of **Completed**.<br> - Check the status of the Certificate Profile must be active. <br> - Verify whether you access the Artifact Signing endpoint from this virtual machine or computer. Try executing the action on a different virtual machine or computer. The error might indicate a network issue. <br> - For Private Trust scenarios 403: The user object ID that does the signing is different from the user object ID that calls `Get-azCodeSigningRootCert`. The appropriate object ID must have the role Artifact Signing Certificate Profile Signer.|
183186
- name: Cost management and billing
184187
questions:
@@ -187,9 +190,9 @@ sections:
187190
To review cost information, in the Azure portal, go to your subscription overview. On the left menu, select **Cost Management**. For more information, see [Cost Management](https://learn.microsoft.com/azure/cost-management-billing/costs/).
188191
189192
To review billing information, go to your subscription overview. On the left menu, select **Billing**. For more information, see [Billing](https://learn.microsoft.com/azure/cost-management-billing/manage/).
190-
- question: Is the pricing pro-rated or it is full amount regardless of when you begin to use the service?
193+
- question: Is the pricing pro-rated or it's full amount regardless of when you begin to use the service?
191194
answer: |
192-
The pricing is not calculated on a pro rata basis. The invoice is generated with the full amount for the SKU that you selected when you created the account, regardless of when you begin to use the service after you create your account.
195+
The pricing isn't calculated on a pro rata basis. The invoice is generated with the full amount for the SKU that you selected when you created the account, regardless of when you begin to use the service after you create your account.
193196
- question: What does the signing quota include?
194197
answer: |
195198
The signing quota encompasses all signing activities across any certificate profile within an Artifact Signing account.
@@ -208,4 +211,4 @@ sections:
208211
Please reach out here: https://www.microsoft.com/en-us/wdsi/filesubmission.
209212
- question: What happens when misuse and abuse of Artifact Signing certificate is confirmed?
210213
answer: |
211-
Artifact Signing may revoke certificate(s) and suspend access to Artifact Signing service if misuse or abuse is confirmed.
214+
Artifact Signing may revoke certificate(s) and suspend access to Artifact Signing service if misuse or abuse is confirmed.

articles/artifact-signing/how-to-signing-integrations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ You can also use the following tools or platforms to set up signing integrations
223223

224224
- **GitHub Actions**: To learn how to use a GitHub action for Artifact Signing, see [Artifact Signing - Actions](https://github.com/azure/artifact-signing-action) in GitHub Marketplace. Complete the instructions to set up and use a GitHub action.
225225

226-
- **Azure DevOps task**: To use the Artifact Signing Azure DevOps task, see [Artifact Signing](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.TrustedSigning&ssr=false#overview) in Visual Studio Marketplace. Complete the instructions for setup.
226+
- **Azure DevOps task**: To use the Artifact Signing Azure DevOps task, see [Artifact Signing](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.ArtifactSigning) in Visual Studio Marketplace. Complete the instructions for setup.
227227

228228
- **PowerShell for Authenticode**: To use PowerShell for Artifact Signing, see [Artifact Signing](https://www.powershellgallery.com/packages/TrustedSigning/) in PowerShell Gallery to install the PowerShell module.
229229

articles/azure-cache-for-redis/.openpublishing.redirection.redis-cache.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,6 @@
436436
"redirect_url": "/azure/redis/quickstart-create-managed-redis",
437437
"redirect_document_id": true
438438
},
439-
{
440-
"source_path_from_root": "/articles/azure-cache-for-redis/scripts/create-manage-cache.md",
441-
"redirect_url": "/azure/redis/scripts/create-manage-cache",
442-
"redirect_document_id": true
443-
},
444439
{
445440
"source_path_from_root": "/articles/azure-cache-for-redis/quickstart-create-redis-enterprise.md",
446441
"redirect_url": "/azure/redis/quickstart-create-managed-redis",

articles/azure-cache-for-redis/TOC.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,20 @@
1414
- name: Create an Azure Cache for Redis instance in the Basic, Standard and Premium tiers
1515
href: quickstart-create-redis.md
1616
- name: Create and manage with Azure PowerShell
17-
href: /azure/redis/how-to-manage-redis-cache-powershell
17+
href: how-to-manage-redis-cache-powershell.md
1818
- name: Create and manage with Azure CLI
19-
href: /azure/redis/scripts/create-manage-cache?pivots=azure-cache-redis
19+
href: scripts/create-manage-cache.md
2020
- name: Create and manage premium cache with Azure CLI
2121
href: scripts/create-manage-premium-cache-cluster.md
2222
- name: Create Redis cache - Bicep
2323
displayName: ARM, Resource Manager, Template
24-
href: /azure/redis/redis-cache-bicep-provision
24+
href: redis-cache-bicep-provision.md
2525
- name: Create Redis cache - ARM template
2626
displayName: Resource Manager
27-
href: /azure/redis/redis-cache-arm-provision
28-
29-
- name: Use a cache
30-
expanded: false
31-
items:
32-
- name: ASP.NET app
33-
href: /azure/redis/web-app-cache-howto
34-
- name: ASP.NET Core app
35-
href: /azure/redis/web-app-aspnet-core-howto
36-
- name: .NET Core app
37-
href: /azure/redis/dotnet-core-quickstart
38-
- name: .NET app
39-
href: /azure/redis/dotnet-how-to-use-azure-redis-cache
27+
href: redis-cache-arm-provision.md
4028
- name: Java app
4129
href: /azure/redis/java-get-started
42-
- name: Node.js app
43-
href: /azure/redis/nodejs-get-started
44-
- name: Python app
45-
href: /azure/redis/python-get-started
46-
- name: Go app
47-
href: /azure/redis/go-get-started
48-
49-
30+
5031
- name: Migration
5132
expanded: true
5233
items:
@@ -78,7 +59,7 @@
7859
- name: Caching architecture
7960
href: /azure/architecture/best-practices/caching?toc=/azure/redis-cache/toc.json
8061
- name: Create and manage with Azure PowerShell
81-
href: /azure/redis/how-to-manage-redis-cache-powershell
62+
href: how-to-manage-redis-cache-powershell.md
8263
- name: Connect an AKS application to a cache
8364
href: /azure/redis/tutorial-aks-get-started
8465
- name: Use Azure CLI

0 commit comments

Comments
 (0)