Skip to content

Commit 9e27a35

Browse files
committed
Merge branch 'master' of https://github.com/Microsoftdocs/azure-docs-pr into funlanding
2 parents e165e8e + 79f3a68 commit 9e27a35

File tree

8 files changed

+146
-58
lines changed

8 files changed

+146
-58
lines changed

articles/azure-app-configuration/quickstart-feature-flag-aspnet-core.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ Add the [Secret Manager tool](https://docs.microsoft.com/aspnet/core/security/ap
8282
1. Add reference to the `Microsoft.Azure.AppConfiguration.AspNetCore` and the `Microsoft.FeatureManagement.AspNetCore` NuGet packages by running the following commands:
8383

8484
```
85-
dotnet add package Microsoft.Azure.AppConfiguration.AspNetCore --version 2.0.0-preview-009470001-12
86-
dotnet add package Microsoft.FeatureManagement.AspNetCore --version 1.0.0-preview-009000001-1251
85+
dotnet add package Microsoft.Azure.AppConfiguration.AspNetCore --version 3.0.0-preview-010560002-1165
86+
dotnet add package Microsoft.FeatureManagement.AspNetCore --version 2.0.0-preview-010610001-1263
8787
```
8888

8989
1. Run the following command to restore packages for your project:
@@ -106,12 +106,6 @@ Add the [Secret Manager tool](https://docs.microsoft.com/aspnet/core/security/ap
106106

107107
You can access this secret with the App Configuration API. A colon (:) works in the configuration name with the App Configuration API on all supported platforms. See [Configuration by environment](https://docs.microsoft.com/aspnet/core/fundamentals/configuration).
108108

109-
1. Open *Program.cs*, and add a reference to the .NET Core App Configuration provider:
110-
111-
```csharp
112-
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
113-
```
114-
115109
1. Update the `CreateWebHostBuilder` method to use App Configuration by calling the `config.AddAzureAppConfiguration()` method.
116110

117111
> [!IMPORTANT]

articles/azure-app-configuration/quickstart-feature-flag-dotnet.md

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,32 @@ The .NET Feature Management libraries extend the framework with comprehensive fe
6464
1. Update the `Main` method to connect to App Configuration, specifying the `UseFeatureFlags` option so that feature flags are retrieved. Then display a message if the `Beta` feature flag is enabled.
6565
6666
```csharp
67-
static void Main(string[] args)
67+
public static void Main(string[] args)
68+
{
69+
AsyncMain().Wait();
70+
}
71+
72+
private static async Task AsyncMain()
6873
{
6974
IConfigurationRoot configuration = new ConfigurationBuilder()
70-
.AddAzureAppConfiguration(options =>
71-
{
75+
.AddAzureAppConfiguration(options =>
76+
{
7277
options.Connect(Environment.GetEnvironmentVariable("ConnectionString"))
73-
.UseFeatureFlags();
78+
.UseFeatureFlags();
7479
}).Build();
75-
76-
IServiceCollection services = new ServiceCollection();
77-
services.AddSingleton<IConfiguration>(configuration).AddFeatureManagement();
78-
IFeatureManager featureManager = services.BuildServiceProvider().GetRequiredService<IFeatureManager>();
79-
80-
if (featureManager.IsEnabled("Beta"))
81-
{
82-
Console.WriteLine("Welcome to the beta");
80+
81+
IServiceCollection services = new ServiceCollection();
82+
83+
services.AddSingleton<IConfiguration>(configuration).AddFeatureManagement();
84+
85+
using (ServiceProvider serviceProvider = services.BuildServiceProvider())
86+
{
87+
IFeatureManager featureManager = serviceProvider.GetRequiredService<IFeatureManager>();
88+
89+
if (await featureManager.IsEnabledAsync("Beta"))
90+
{
91+
Console.WriteLine("Welcome to the beta!");
92+
}
8393
}
8494
8595
Console.WriteLine("Hello World!");

articles/azure-app-configuration/use-feature-flags-dotnet-core.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ The basic pattern of feature management is to first check if a feature flag is s
175175
```csharp
176176
IFeatureManager featureManager;
177177
...
178-
if (featureManager.IsEnabled(nameof(MyFeatureFlags.FeatureA)))
178+
if (await featureManager.IsEnabledAsync(nameof(MyFeatureFlags.FeatureA)))
179179
{
180180
// Run the following code
181181
}
@@ -252,7 +252,7 @@ The feature `<feature>` tag can also be used to show content if any or all featu
252252

253253
## MVC filters
254254

255-
You can set up MVC filters so that they're activated based on the state of a feature flag. The following code adds an MVC filter named `SomeMvcFilter`. This filter is triggered within the MVC pipeline only if `FeatureA` is enabled.
255+
You can set up MVC filters so that they're activated based on the state of a feature flag. The following code adds an MVC filter named `SomeMvcFilter`. This filter is triggered within the MVC pipeline only if `FeatureA` is enabled. This capability is limited to `IAsyncActionFilter`.
256256

257257
```csharp
258258
using Microsoft.FeatureManagement.FeatureFilters;
@@ -267,16 +267,6 @@ public void ConfigureServices(IServiceCollection services)
267267
}
268268
```
269269

270-
## Routes
271-
272-
You can use feature flags to dynamically expose routes. The following code adds a route, which sets `Beta` as the default controller only when `FeatureA` is enabled:
273-
274-
```csharp
275-
app.UseMvc(routes => {
276-
routes.MapRouteForFeature(nameof(MyFeatureFlags.FeatureA), "betaDefault", "{controller=Beta}/{action=Index}/{id?}");
277-
});
278-
```
279-
280270
## Middleware
281271

282272
You can also use feature flags to conditionally add application branches and middleware. The following code inserts a middleware component in the request pipeline only when `FeatureA` is enabled:

articles/cloud-services/cloud-services-guestos-msrc-releases.md

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,60 @@ ms.service: cloud-services
1010
ms.topic: article
1111
ms.tgt_pltfrm: na
1212
ms.workload: tbd
13-
ms.date: 01/08/2020
13+
ms.date: 01/15/2020
1414
ms.author: raiye
1515
---
1616
# Azure Guest OS
1717
The following tables show the Microsoft Security Response Center (MSRC) updates applied to the Azure Guest OS. Search this article to determine if a particular update applies to the Guest OS you are using. Updates always carry forward for the particular [family][family-explain] they were introduced in.
1818

19+
## January 2020 Guest OS
20+
21+
>[!NOTE]
22+
>The January Guest OS is currently being rolled out to Cloud Service VMs that are configured for automatic updates. When the rollout is complete, this version will be made available for manual updates through the Azure portal and configuration files. The following patches are included in the January Guest OS. This list is subject to change.
23+
24+
| Product Category | Parent KB Article | Vulnerability Description | Guest OS | Date First Introduced |
25+
| --- | --- | --- | --- | --- |
26+
| Rel 20-01  | [4532960] | Windows Security  | 2.94 | Jan 14, 2020 |
27+
| Rel 20-01  | [4534251] | Internet Explorer  | 2.94 | Jan 14, 2020 |
28+
| Rel 20-01  | [4534314] | Windows Security  | 2.94 | Jan 14, 2020 |
29+
| Rel 20-01  | [4532958] | Windows Security  | 3.81 | Jan 14, 2020 |
30+
| Rel 20-01  | [4532963] | Windows Security  | 3.81 | Jan 14, 2020 |
31+
| Rel 20-01  | [4534251] | Internet Explorer  | 3.81 | Jan 14, 2020 |
32+
| Rel 20-01  | [4534288] | Windows Security  | 3.81 | Jan 14, 2020 |
33+
| Rel 20-01  | [4532961] | Windows Security  | 4.74 | Jan 14, 2020 |
34+
| Rel 20-01  | [4532962] | Windows Security  | 4.74 | Jan 14, 2020 |
35+
| Rel 20-01  | [4534251] | Internet Explorer  | 4.74 | Jan 14, 2020 |
36+
| Rel 20-01  | [4534309] | Windows Security  | 4.74 | Jan 14, 2020 |
37+
| Rel 20-01  | [4494175] | Microcode v3  | 5.39 | Aug 29, 2019 |
38+
| Rel 20-01  | [4534271] | LCU  | 5.39 | Jan 14, 2020 |
39+
| Rel 20-01  | [4494174] | Microcode v4  | 6.15 | Aug 29, 2019 |
40+
| Rel 20-01  | [4532947] | Windows Security  | 6.15 | Jan 14, 2020 |
41+
| Rel 20-01  | [4534273] | LCU  | 6.15 | Jan 14, 2020 |
42+
| Rel 20-01  | [4530734] | Non-Security  | 2.94 | Dec 10, 2019 |
43+
| Rel 20-01  | [4530691] | Non-Security   | 3.81 | Dec 10, 2019 |
44+
| Rel 20-01  | [4530702] | Non-Security  | 4.74 | Dec 10, 2019 |
45+
46+
[4532960]: https://support.microsoft.com/kb/4532960
47+
[4534251]: https://support.microsoft.com/kb/4534251
48+
[4534314]: https://support.microsoft.com/kb/4534314
49+
[4532958]: https://support.microsoft.com/kb/4532958
50+
[4532963]: https://support.microsoft.com/kb/4532963
51+
[4534251]: https://support.microsoft.com/kb/4534251
52+
[4534288]: https://support.microsoft.com/kb/4534288
53+
[4532961]: https://support.microsoft.com/kb/4532961
54+
[4532962]: https://support.microsoft.com/kb/4532962
55+
[4534251]: https://support.microsoft.com/kb/4534251
56+
[4534309]: https://support.microsoft.com/kb/4534309
57+
[4494175]: https://support.microsoft.com/kb/4494175
58+
[4534271]: https://support.microsoft.com/kb/4534271
59+
[4494174]: https://support.microsoft.com/kb/4494174
60+
[4532947]: https://support.microsoft.com/kb/4532947
61+
[4534273]: https://support.microsoft.com/kb/4534273
62+
[4530734]: https://support.microsoft.com/kb/4530734
63+
[4530691]: https://support.microsoft.com/kb/4530691
64+
[4530702]: https://support.microsoft.com/kb/4530702
65+
66+
1967
## December 2019 Guest OS
2068

2169
| Product Category | Parent KB Article | Vulnerability Description | Guest OS | Date First Introduced |

articles/cognitive-services/Speech-Service/how-to-automatic-language-detection.md

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: speech-service
1010
ms.topic: conceptual
11-
ms.date: 10/26/2019
11+
ms.date: 01/15/2020
1212
ms.author: qiohu
13+
zone_pivot_groups: programming-languages-set-seven
1314
---
1415

1516
# Automatic language detection for speech to text
@@ -19,7 +20,7 @@ Automatic language detection is used to determine the most likely match for audi
1920
In this article, you'll learn how to use `AutoDetectSourceLanguageConfig` to construct a `SpeechRecognizer` object and retrieve the detected language.
2021

2122
> [!IMPORTANT]
22-
> This feature is only available for the Speech SDK for C++ and the Speech SDK for Java.
23+
> This feature is only available for the Speech SDK for C#, C++ and Java.
2324
2425
## Automatic language detection with the Speech SDK
2526

@@ -30,6 +31,22 @@ Automatic language detection currently has a services-side limit of two language
3031
3132
The following snippets illustrate how to use automatic language detection in your apps:
3233

34+
::: zone pivot="programming-language-csharp"
35+
36+
```csharp
37+
var autoDetectSourceLanguageConfig = AutoDetectSourceLanguageConfig.FromLanguages(new string[] { "en-US", "de-DE" });
38+
using (var recognizer = new SpeechRecognizer(speechConfig, autoDetectSourceLanguageConfig, audioConfig))
39+
{
40+
var speechRecognitionResult = await recognizer.RecognizeOnceAsync();
41+
var autoDetectSourceLanguageResult = AutoDetectSourceLanguageResult.FromResult(speechRecognitionResult);
42+
var detectedLanguage = autoDetectSourceLanguageResult.Language;
43+
}
44+
```
45+
46+
::: zone-end
47+
48+
::: zone pivot="programming-language-cpp"
49+
3350
```C++
3451
auto autoDetectSourceLanguageConfig = AutoDetectSourceLanguageConfig::FromLanguages({ "en-US", "de-DE" });
3552
auto recognizer = SpeechRecognizer::FromConfig(speechConfig, autoDetectSourceLanguageConfig, audioConfig);
@@ -38,6 +55,10 @@ auto autoDetectSourceLanguageResult = AutoDetectSourceLanguageResult::FromResult
3855
auto detectedLanguage = autoDetectSourceLanguageResult->Language;
3956
```
4057
58+
::: zone-end
59+
60+
::: zone pivot="programming-language-java"
61+
4162
```Java
4263
AutoDetectSourceLanguageConfig autoDetectSourceLanguageConfig = AutoDetectSourceLanguageConfig.fromLanguages(Arrays.asList("en-US", "de-DE"));
4364
SpeechRecognizer recognizer = new SpeechRecognizer(speechConfig, autoDetectSourceLanguageConfig, audioConfig);
@@ -53,26 +74,49 @@ audioConfig.close();
5374
result.close();
5475
```
5576

77+
::: zone-end
78+
5679
## Use a custom model for automatic language detection
5780

5881
In addition to language detection using Speech service models, you can specify a custom model for enhanced recognition. If a custom model isn't provided, the service will use the default language model.
5982

6083
The snippets below illustrate how to specify a custom model in your call to the Speech service. If the detected language is `en-US`, then the default model is used. If the detected language is `fr-FR`, then the endpoint for the custom model is used:
6184

85+
::: zone pivot="programming-language-csharp"
86+
87+
```csharp
88+
var sourceLanguageConfigs = new SourceLanguageConfig[]
89+
{
90+
SourceLanguageConfig.FromLanguage("en-US"),
91+
SourceLanguageConfig.FromLanguage("fr-FR", "The Endpoint Id for custom model of fr-FR")
92+
};
93+
var autoDetectSourceLanguageConfig = AutoDetectSourceLanguageConfig.FromSourceLanguageConfigs(sourceLanguageConfigs);
94+
```
95+
96+
::: zone-end
97+
98+
::: zone pivot="programming-language-cpp"
99+
62100
```C++
63101
std::vector<std::shared_ptr<SourceLanguageConfig>> sourceLanguageConfigs;
64102
sourceLanguageConfigs.push_back(SourceLanguageConfig::FromLanguage("en-US"));
65103
sourceLanguageConfigs.push_back(SourceLanguageConfig::FromLanguage("fr-FR", "The Endpoint Id for custom model of fr-FR"));
66104
auto autoDetectSourceLanguageConfig = AutoDetectSourceLanguageConfig::FromSourceLanguageConfigs(sourceLanguageConfigs);
67105
```
68106

107+
::: zone-end
108+
109+
::: zone pivot="programming-language-java"
110+
69111
```Java
70112
List sourceLanguageConfigs = new ArrayList<SourceLanguageConfig>();
71113
sourceLanguageConfigs.add(SourceLanguageConfig.fromLanguage("en-US"));
72114
sourceLanguageConfigs.add(SourceLanguageConfig.fromLanguage("fr-FR", "The Endpoint Id for custom model of fr-FR"));
73115
AutoDetectSourceLanguageConfig autoDetectSourceLanguageConfig = AutoDetectSourceLanguageConfig.fromSourceLanguageConfigs(sourceLanguageConfigs);
74116
```
75117

118+
::: zone-end
119+
76120
## Next steps
77121

78122
- [Speech SDK reference documentation](speech-sdk.md)

articles/cognitive-services/Speech-Service/how-to-specify-source-language.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: speech-service
1010
ms.topic: conceptual
11-
ms.date: 10/26/2019
11+
ms.date: 01/07/2020
1212
ms.author: qiohu
1313
zone_pivot_groups: programming-languages-set-two
1414
---
@@ -21,24 +21,29 @@ In this article, you'll learn how to specify the source language for an audio in
2121

2222
## How to specify source language in C#
2323

24-
The first step is to create a `SpeechConfig`:
24+
In this example, the source language is provided explicitly as a parameter using `SpeechRecognizer` construct.
2525

2626
```csharp
27-
var speechConfig = SpeechConfig.FromSubscription("YourSubscriptionKey", "YourServiceRegion");
27+
var recognizer = new SpeechRecognizer(speechConfig, "de-DE", audioConfig);
2828
```
2929

30-
Next, specify the source language of your audio with `SpeechRecognitionLanguage`:
30+
In this example, the source language is provided using `SourceLanguageConfig`. Then, the `sourceLanguageConfig` is passed as a parameter to `SpeechRecognizer` construct.
3131

3232
```csharp
33-
speechConfig.SpeechRecognitionLanguage = "de-DE";
33+
var sourceLanguageConfig = SourceLanguageConfig.FromLanguage("de-DE");
34+
var recognizer = new SpeechRecognizer(speechConfig, sourceLanguageConfig, audioConfig);
3435
```
3536

36-
If you're using a custom model for recognition, you can specify the endpoint with `EndpointId`:
37+
In this example, the source language and custom endpoint are provided using `SourceLanguageConfig`. Then, the `sourceLanguageConfig` is passed as a parameter to `SpeechRecognizer` construct.
3738

3839
```csharp
39-
speechConfig.EndpointId = "The Endpoint ID for your custom model.";
40+
var sourceLanguageConfig = SourceLanguageConfig.FromLanguage("de-DE", "The Endpoint ID for your custom model.");
41+
var recognizer = new SpeechRecognizer(speechConfig, sourceLanguageConfig, audioConfig);
4042
```
4143

44+
>[!Note]
45+
> `SpeechRecognitionLanguage` and `EndpointId` set methods are deprecated from the `SpeechConfig` class in C#. The use of these methods are discouraged, and shouldn't be used when constructing a `SpeechRecognizer`.
46+
4247
::: zone-end
4348

4449
::: zone pivot="programming-language-cpp"

articles/virtual-machines/linux/update-infrastructure-redhat.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ms.service: virtual-machines-linux
1313
ms.topic: article
1414
ms.tgt_pltfrm: vm-linux
1515
ms.workload: infrastructure-services
16-
ms.date: 6/6/2019
17-
ms.author: borisb
16+
ms.date: 1/15/2020
17+
ms.author: guybo
1818

1919
---
2020
# Red Hat Update Infrastructure for on-demand Red Hat Enterprise Linux VMs in Azure
@@ -197,19 +197,6 @@ In September 2016, we deployed an updated Azure RHUI. In April 2017, we shut dow
197197
198198
The new Azure RHUI servers are deployed with [Azure Traffic Manager](https://azure.microsoft.com/services/traffic-manager/). In Traffic Manager, a single endpoint (rhui-1.microsoft.com) can be used by any VM, regardless of region.
199199
200-
### Manual update procedure to use the Azure RHUI servers
201-
This procedure is provided for reference only. RHEL PAYG images already have the correct configuration to connect to Azure RHUI. To manually update the configuration to use the Azure RHUI servers, complete the following steps:
202-
203-
- For RHEL 6:
204-
```bash
205-
yum --config='https://rhelimage.blob.core.windows.net/repositories/rhui-microsoft-azure-rhel6.config' install 'rhui-azure-rhel6'
206-
```
207-
208-
- For RHEL 7:
209-
```bash
210-
yum --config='https://rhelimage.blob.core.windows.net/repositories/rhui-microsoft-azure-rhel7.config' install 'rhui-azure-rhel7'
211-
```
212-
213200
## Next steps
214201
* To create a Red Hat Enterprise Linux VM from an Azure Marketplace PAYG image and to use Azure-hosted RHUI, go to the [Azure Marketplace](https://azure.microsoft.com/marketplace/partners/redhat/).
215202
* To learn more about the Red Hat images in Azure, go to the [documentation page](./rhel-images.md).

articles/zone-pivot-groups.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,21 @@ groups:
9696
title: Python
9797
- id: programming-language-nodejs
9898
title: Node.js
99+
- id: programming-languages-set-seven
100+
title: Programming languages
101+
prompt: Choose a programming language
102+
pivots:
103+
- id: programming-language-csharp
104+
title: C#
105+
- id: programming-language-cpp
106+
title: C++
107+
- id: programming-language-java
108+
title: Java
99109
- id: URL-test-interface
100110
title: URL Test tool
101111
prompt: Choose one of the following
102112
pivots:
103113
- id: url-test-tool-curl
104114
title: cURL
105115
- id: url-test-tool-postman
106-
title: Postman
116+
title: Postman

0 commit comments

Comments
 (0)