Skip to content

Commit 2b64439

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 9385f77 + b5ba67a commit 2b64439

File tree

277 files changed

+3555
-3496
lines changed

Some content is hidden

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

277 files changed

+3555
-3496
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 316 additions & 316 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9385,6 +9385,11 @@
93859385
"redirect_url": "/visualstudio/containers/overview-local-process-kubernetes",
93869386
"redirect_document_id": false
93879387
},
9388+
{
9389+
"source_path_from_root": "/articles/docker/index.yml",
9390+
"redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",
9391+
"redirect_document_id": false
9392+
},
93889393
{
93899394
"source_path_from_root": "/articles/vs-azure-tools-docker-edit-and-refresh.md",
93909395
"redirect_url": "/visualstudio/docker/vs-azure-tools-docker-edit-and-refresh",

.whatsnew/.application-management.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

.whatsnew/.application-provisioning.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

.whatsnew/.application-proxy.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

.whatsnew/.external-identities-ciam.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

.whatsnew/.external-identities.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

.whatsnew/.microsoft-identity-platform.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

articles/active-directory-b2c/partner-akamai-secure-hybrid-access.md

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -218,45 +218,46 @@ Akamai Enterprise Application Access supports SAML federation with cloud IdPs li
218218
```xml
219219
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
220220
<TrustFrameworkPolicy
221-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
222-
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
223-
xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06"
224-
PolicySchemaVersion="0.3.0.0"
225-
TenantId="fabrikam.onmicrosoft.com"
226-
PolicyId="B2C_1A_signup_signin_saml"
227-
PublicPolicyUri="http://fabrikam.onmicrosoft.com/B2C_1A_signup_signin_saml">
228-
<BasePolicy>
229-
<TenantId>fabrikam.onmicrosoft.com</TenantId>
230-
<PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
231-
</BasePolicy>
232-
233-
<UserJourneys>
234-
<UserJourney Id="SignUpOrSignIn">
235-
<OrchestrationSteps>
236-
<OrchestrationStep Order="7" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="AkamaiSaml2AssertionIssuer"/>
237-
</OrchestrationSteps>
238-
</UserJourney>
239-
</UserJourneys>
240-
<RelyingParty>
241-
<DefaultUserJourney ReferenceId="SignUpOrSignIn" />
242-
<TechnicalProfile Id="PolicyProfile">
243-
<DisplayName>PolicyProfile</DisplayName>
244-
<Protocol Name="SAML2"/>
245-
<OutputClaims>
246-
<OutputClaim ClaimTypeReferenceId="displayName" />
247-
<OutputClaim ClaimTypeReferenceId="givenName" />
248-
<OutputClaim ClaimTypeReferenceId="surname" />
249-
<OutputClaim ClaimTypeReferenceId="email" DefaultValue="" />
250-
<OutputClaim ClaimTypeReferenceId="identityProvider" DefaultValue="" />
251-
<OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="objectId"/>
252-
</OutputClaims>
253-
<SubjectNamingInfo ClaimType="objectId" ExcludeAsClaim="true"/>
254-
</TechnicalProfile>
255-
</RelyingParty>
256-
</TrustFrameworkPolicy>
257-
```
258-
>[!NOTE]
259-
>You can follow this same process to implement other types of flows, for example, sign-in, password reset, or profile editing flows.
221+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
222+
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
223+
xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06"
224+
PolicySchemaVersion="0.3.0.0"
225+
TenantId="fabrikam.onmicrosoft.com"
226+
PolicyId="B2C_1A_signup_signin_saml"
227+
PublicPolicyUri="http://fabrikam.onmicrosoft.com/B2C_1A_signup_signin_saml">
228+
<BasePolicy>
229+
<TenantId>fabrikam.onmicrosoft.com</TenantId>
230+
<PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
231+
</BasePolicy>
232+
233+
<UserJourneys>
234+
<UserJourney Id="SignUpOrSignIn">
235+
<OrchestrationSteps>
236+
<OrchestrationStep Order="7" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="AkamaiSaml2AssertionIssuer"/>
237+
</OrchestrationSteps>
238+
</UserJourney>
239+
</UserJourneys>
240+
<RelyingParty>
241+
<DefaultUserJourney ReferenceId="SignUpOrSignIn" />
242+
<TechnicalProfile Id="PolicyProfile">
243+
<DisplayName>PolicyProfile</DisplayName>
244+
<Protocol Name="SAML2"/>
245+
<OutputClaims>
246+
<OutputClaim ClaimTypeReferenceId="displayName" />
247+
<OutputClaim ClaimTypeReferenceId="givenName" />
248+
<OutputClaim ClaimTypeReferenceId="surname" />
249+
<OutputClaim ClaimTypeReferenceId="email" DefaultValue="" />
250+
<OutputClaim ClaimTypeReferenceId="identityProvider" DefaultValue="" />
251+
<OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="objectId"/>
252+
</OutputClaims>
253+
<SubjectNamingInfo ClaimType="objectId" ExcludeAsClaim="true"/>
254+
</TechnicalProfile>
255+
</RelyingParty>
256+
</TrustFrameworkPolicy>
257+
```
258+
259+
>[!NOTE]
260+
>You can follow this same process to implement other types of flows, for example, sign-in, password reset, or profile editing flows.
260261
261262
### Step 4 - Upload your policy
262263

articles/ai-services/cognitive-services-virtual-networks.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,11 @@ You can manage IP network rules for Azure AI services resources through the Azur
401401
402402
```azurepowershell-interactive
403403
$parameters = @{
404-
"ResourceGroupName" = "myresourcegroup"
405-
"Name" = "myaccount"
406-
}
407-
(Get-AzCognitiveServicesAccountNetworkRuleSet @parameters).IPRules
408-
```
404+
"ResourceGroupName" = "myresourcegroup"
405+
"Name" = "myaccount"
406+
}
407+
(Get-AzCognitiveServicesAccountNetworkRuleSet @parameters).IPRules
408+
```
409409

410410
1. Add a network rule for an individual IP address.
411411

0 commit comments

Comments
 (0)