Skip to content

Commit 8fd23eb

Browse files
lauren-millslauren-mills
authored
Merge pull request microsoft#3825 from southworks/external/feature/southworks/deprecation-plan/update-sdk
[C# & TypeScript] Update SDK versions to latest (4.13)
2 parents 6084613 + a4e4af4 commit 8fd23eb

File tree

65 files changed

+1150
-2256
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

+1150
-2256
lines changed

‎samples/csharp/assistants/enterprise-assistant/VirtualAssistantSample/Adapters/DefaultAdapter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77
using Microsoft.Bot.Builder;
8-
using Microsoft.Bot.Builder.Azure;
8+
using Microsoft.Bot.Builder.Azure.Blobs;
99
using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
1010
using Microsoft.Bot.Builder.Integration.AspNet.Core;
1111
using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
@@ -62,11 +62,11 @@ public DefaultAdapter(
6262

6363
// Uncomment the following line for local development without Azure Storage
6464
// Use(new TranscriptLoggerMiddleware(new MemoryTranscriptStore()));
65-
Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
65+
Use(new TranscriptLoggerMiddleware(new BlobsTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
6666
Use(new ShowTypingMiddleware());
6767
Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
6868
Use(new EventDebuggerMiddleware());
69-
Use(new SetSpeakMiddleware());
69+
Use(new SetSpeakMiddleware("en-US-JennyNeural", true));
7070
Use(new ProactiveStateMiddleware(proactiveState));
7171
}
7272

‎samples/csharp/assistants/enterprise-assistant/VirtualAssistantSample/Authentication/AllowedCallersClaimsValidator.cs‎

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

‎samples/csharp/assistants/enterprise-assistant/VirtualAssistantSample/Startup.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66
using System.IO;
7+
using System.Linq;
78
using Microsoft.ApplicationInsights.Extensibility;
89
using Microsoft.AspNetCore.Builder;
910
using Microsoft.AspNetCore.Hosting;
@@ -25,7 +26,6 @@
2526
using Microsoft.Extensions.DependencyInjection;
2627
using Microsoft.Extensions.Hosting;
2728
using VirtualAssistantSample.Adapters;
28-
using VirtualAssistantSample.Authentication;
2929
using VirtualAssistantSample.Bots;
3030
using VirtualAssistantSample.Dialogs;
3131
using VirtualAssistantSample.Feedback;
@@ -75,7 +75,8 @@ public void ConfigureServices(IServiceCollection services)
7575
services.AddSingleton(skillsConfig);
7676

7777
// Register AuthConfiguration to enable custom claim validation.
78-
services.AddSingleton(sp => new AuthenticationConfiguration { ClaimsValidator = new AllowedCallersClaimsValidator(skillsConfig) });
78+
var allowedCallers = (from skill in skillsConfig.Skills.Values select skill.AppId).ToList();
79+
services.AddSingleton(sp => new AuthenticationConfiguration { ClaimsValidator = new AllowedCallersClaimsValidator(allowedCallers) });
7980

8081
// Configure telemetry
8182
services.AddApplicationInsightsTelemetry();

‎samples/csharp/assistants/enterprise-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
1515
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
1616
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
17-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.1" />
18-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.1" />
19-
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.1" />
20-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.1" />
21-
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.1" />
22-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.1" />
23-
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.9.1" />
24-
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.0" />
17+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.13.2" />
18+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.13.2" />
19+
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.13.2" />
20+
<PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.13.2" />
21+
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.13.2" />
22+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.13.2" />
23+
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.13.2" />
24+
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.1.0" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample.Tests/BotTestBase.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Microsoft.Bot.Builder.LanguageGeneration;
1414
using Microsoft.Bot.Connector.Authentication;
1515
using Microsoft.Bot.Solutions;
16-
using Microsoft.Bot.Solutions.Feedback;
1716
using Microsoft.Bot.Solutions.Responses;
1817
using Microsoft.Bot.Solutions.Skills.Dialogs;
1918
using Microsoft.Bot.Solutions.Testing;
@@ -139,8 +138,7 @@ public virtual void Initialize()
139138
public TestFlow GetTestFlow(bool includeUserProfile = true)
140139
{
141140
var sp = Services.BuildServiceProvider();
142-
var adapter = sp.GetService<TestAdapter>()
143-
.Use(new FeedbackMiddleware(sp.GetService<ConversationState>(), sp.GetService<IBotTelemetryClient>()));
141+
var adapter = sp.GetService<TestAdapter>();
144142

145143
var userState = sp.GetService<UserState>();
146144
var userProfileState = userState.CreateProperty<UserProfileState>(nameof(UserProfileState));

‎samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample/Adapters/DefaultAdapter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77
using Microsoft.Bot.Builder;
8-
using Microsoft.Bot.Builder.Azure;
8+
using Microsoft.Bot.Builder.Azure.Blobs;
99
using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
1010
using Microsoft.Bot.Builder.Integration.AspNet.Core;
1111
using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
@@ -62,11 +62,11 @@ public DefaultAdapter(
6262

6363
// Uncomment the following line for local development without Azure Storage
6464
// Use(new TranscriptLoggerMiddleware(new MemoryTranscriptStore()));
65-
Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
65+
Use(new TranscriptLoggerMiddleware(new BlobsTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
6666
Use(new ShowTypingMiddleware());
6767
Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
6868
Use(new EventDebuggerMiddleware());
69-
Use(new SetSpeakMiddleware());
69+
Use(new SetSpeakMiddleware("en-US-JennyNeural", true));
7070
Use(new ProactiveStateMiddleware(proactiveState));
7171
}
7272

‎samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample/Authentication/AllowedCallersClaimsValidator.cs‎

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

‎samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample/Startup.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66
using System.IO;
7+
using System.Linq;
78
using Bot.Builder.Community.Adapters.Google;
89
using Microsoft.ApplicationInsights.Extensibility;
910
using Microsoft.AspNetCore.Builder;
@@ -25,7 +26,6 @@
2526
using Microsoft.Extensions.DependencyInjection;
2627
using Microsoft.Extensions.Hosting;
2728
using VirtualAssistantSample.Adapters;
28-
using VirtualAssistantSample.Authentication;
2929
using VirtualAssistantSample.Bots;
3030
using VirtualAssistantSample.Dialogs;
3131
using VirtualAssistantSample.Services;
@@ -74,7 +74,8 @@ public void ConfigureServices(IServiceCollection services)
7474
services.AddSingleton(skillsConfig);
7575

7676
// Register AuthConfiguration to enable custom claim validation.
77-
services.AddSingleton(sp => new AuthenticationConfiguration { ClaimsValidator = new AllowedCallersClaimsValidator(skillsConfig) });
77+
var allowedCallers = (from skill in skillsConfig.Skills.Values select skill.AppId).ToList();
78+
services.AddSingleton(sp => new AuthenticationConfiguration { ClaimsValidator = new AllowedCallersClaimsValidator(allowedCallers) });
7879

7980
// Configure telemetry
8081
services.AddApplicationInsightsTelemetry();

‎samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
1616
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
1717
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
18-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.3" />
19-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.3" />
20-
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.3" />
21-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.3" />
22-
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.3" />
23-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.3" />
24-
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.9.3" />
25-
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.1" />
18+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.13.2" />
19+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.13.2" />
20+
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.13.2" />
21+
<PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.13.2" />
22+
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.13.2" />
23+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.13.2" />
24+
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.13.2" />
25+
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.1.0" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

‎samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/Adapters/DefaultAdapter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77
using Microsoft.Bot.Builder;
8-
using Microsoft.Bot.Builder.Azure;
8+
using Microsoft.Bot.Builder.Azure.Blobs;
99
using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
1010
using Microsoft.Bot.Builder.Integration.AspNet.Core;
1111
using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
@@ -60,11 +60,11 @@ public DefaultAdapter(
6060

6161
// Uncomment the following line for local development without Azure Storage
6262
// Use(new TranscriptLoggerMiddleware(new MemoryTranscriptStore()));
63-
Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
63+
Use(new TranscriptLoggerMiddleware(new BlobsTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
6464
Use(new ShowTypingMiddleware());
6565
Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
6666
Use(new EventDebuggerMiddleware());
67-
Use(new SetSpeakMiddleware());
67+
Use(new SetSpeakMiddleware("en-US-JennyNeural", true));
6868
}
6969

7070
private async Task HandleTurnErrorAsync(ITurnContext turnContext, Exception exception)

0 commit comments

Comments
 (0)