Skip to content

Commit

Permalink
Merge pull request microsoft#3825 from southworks/external/feature/so…
Browse files Browse the repository at this point in the history 
…uthworks/deprecation-plan/update-sdk

[C# & TypeScript] Update SDK versions to latest (4.13)
  • Loading branch information
@lauren-mills
lauren-mills authored Jun 9, 2021
2 parents 6084613 + a4e4af4 commit 8fd23eb
Show file tree
Hide file tree
Showing 65 changed files with 1,150 additions and 2,256 deletions.
6 changes: 3 additions & 3 deletions .../csharp/assistants/enterprise-assistant/VirtualAssistantSample/Adapters/DefaultAdapter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Azure;
using Microsoft.Bot.Builder.Azure.Blobs;
using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
Expand Down Expand Up @@ -62,11 +62,11 @@ public DefaultAdapter(

// Uncomment the following line for local development without Azure Storage
// Use(new TranscriptLoggerMiddleware(new MemoryTranscriptStore()));
Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
Use(new TranscriptLoggerMiddleware(new BlobsTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
Use(new ShowTypingMiddleware());
Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
Use(new EventDebuggerMiddleware());
Use(new SetSpeakMiddleware());
Use(new SetSpeakMiddleware("en-US-JennyNeural", true));
Use(new ProactiveStateMiddleware(proactiveState));
}

Expand Down
48 changes: 0 additions & 48 deletions ...terprise-assistant/VirtualAssistantSample/Authentication/AllowedCallersClaimsValidator.cs
View file

This file was deleted.

5 changes: 3 additions & 2 deletions samples/csharp/assistants/enterprise-assistant/VirtualAssistantSample/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
Expand All @@ -25,7 +26,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using VirtualAssistantSample.Adapters;
using VirtualAssistantSample.Authentication;
using VirtualAssistantSample.Bots;
using VirtualAssistantSample.Dialogs;
using VirtualAssistantSample.Feedback;
Expand Down Expand Up @@ -75,7 +75,8 @@ public void ConfigureServices(IServiceCollection services)
services.AddSingleton(skillsConfig);

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

// Configure telemetry
services.AddApplicationInsightsTelemetry();
Expand Down
16 changes: 8 additions & 8 deletions ...harp/assistants/enterprise-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.0" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample.Tests/BotTestBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using Microsoft.Bot.Builder.LanguageGeneration;
using Microsoft.Bot.Connector.Authentication;
using Microsoft.Bot.Solutions;
using Microsoft.Bot.Solutions.Feedback;
using Microsoft.Bot.Solutions.Responses;
using Microsoft.Bot.Solutions.Skills.Dialogs;
using Microsoft.Bot.Solutions.Testing;
Expand Down Expand Up @@ -139,8 +138,7 @@ public virtual void Initialize()
public TestFlow GetTestFlow(bool includeUserProfile = true)
{
var sp = Services.BuildServiceProvider();
var adapter = sp.GetService<TestAdapter>()
.Use(new FeedbackMiddleware(sp.GetService<ConversationState>(), sp.GetService<IBotTelemetryClient>()));
var adapter = sp.GetService<TestAdapter>();

var userState = sp.GetService<UserState>();
var userProfileState = userState.CreateProperty<UserProfileState>(nameof(UserProfileState));
Expand Down
6 changes: 3 additions & 3 deletions ...csharp/assistants/hospitality-assistant/VirtualAssistantSample/Adapters/DefaultAdapter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Azure;
using Microsoft.Bot.Builder.Azure.Blobs;
using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
Expand Down Expand Up @@ -62,11 +62,11 @@ public DefaultAdapter(

// Uncomment the following line for local development without Azure Storage
// Use(new TranscriptLoggerMiddleware(new MemoryTranscriptStore()));
Use(new TranscriptLoggerMiddleware(new AzureBlobTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
Use(new TranscriptLoggerMiddleware(new BlobsTranscriptStore(settings.BlobStorage.ConnectionString, settings.BlobStorage.Container)));
Use(new ShowTypingMiddleware());
Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
Use(new EventDebuggerMiddleware());
Use(new SetSpeakMiddleware());
Use(new SetSpeakMiddleware("en-US-JennyNeural", true));
Use(new ProactiveStateMiddleware(proactiveState));
}

Expand Down
48 changes: 0 additions & 48 deletions ...pitality-assistant/VirtualAssistantSample/Authentication/AllowedCallersClaimsValidator.cs
View file

This file was deleted.

5 changes: 3 additions & 2 deletions samples/csharp/assistants/hospitality-assistant/VirtualAssistantSample/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Bot.Builder.Community.Adapters.Google;
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.AspNetCore.Builder;
Expand All @@ -25,7 +26,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using VirtualAssistantSample.Adapters;
using VirtualAssistantSample.Authentication;
using VirtualAssistantSample.Bots;
using VirtualAssistantSample.Dialogs;
using VirtualAssistantSample.Services;
Expand Down Expand Up @@ -74,7 +74,8 @@ public void ConfigureServices(IServiceCollection services)
services.AddSingleton(skillsConfig);

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

// Configure telemetry
services.AddApplicationInsightsTelemetry();
Expand Down
16 changes: 8 additions & 8 deletions ...arp/assistants/hospitality-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...les/csharp/assistants/virtual-assistant/VirtualAssistantSample/Adapters/DefaultAdapter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Azure;
using Microsoft.Bot.Builder.Azure.Blobs;
using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
using Microsoft.Bot.Builder.Integration.AspNet.Core.Skills;
Expand Down Expand Up @@ -60,11 +60,11 @@ public DefaultAdapter(

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

private async Task HandleTurnErrorAsync(ITurnContext turnContext, Exception exception)
Expand Down
48 changes: 0 additions & 48 deletions .../virtual-assistant/VirtualAssistantSample/Authentication/AllowedCallersClaimsValidator.cs
View file

This file was deleted.

5 changes: 3 additions & 2 deletions samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
Expand All @@ -24,7 +25,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using VirtualAssistantSample.Adapters;
using VirtualAssistantSample.Authentication;
using VirtualAssistantSample.Bots;
using VirtualAssistantSample.Dialogs;
using VirtualAssistantSample.Services;
Expand Down Expand Up @@ -76,7 +76,8 @@ public void ConfigureServices(IServiceCollection services)
services.AddSingleton(skillsConfig);

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

// Configure telemetry
services.AddApplicationInsightsTelemetry();
Expand Down
16 changes: 8 additions & 8 deletions .../csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.11.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.11.1" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.11.1" />
<PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.11.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.11.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.11.1" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.11.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 8fd23eb

Please sign in to comment.