fix: Remove native Orchestrator DLLs from Runtime (microsoft#5471)

* Remove Orchestrator from runtime * remove pdb hack as well
mdasmendel · Jan 9, 2021 · 67990cc · 67990cc
1 parent 5fc16c8
commit 67990cc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj b/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
@@ -19,7 +19,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.11.0" />
     <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.Orchestrator" Version="4.11.0-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.11.0" />
     <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.11.0" />
     <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.11.0" />
@@ -39,10 +38,4 @@
   <ItemGroup>
     <ProjectReference Include="..\core\Microsoft.BotFramework.Composer.Core.csproj" />
   </ItemGroup>
-
-  <!-- onnxruntime.pdb is dummied out for publishing due to its size. If you need these debug symbols in your published deployment, please comment out the section below. -->
-  <Target Name="RemoveOnnxRuntimePdb" AfterTargets="Publish">
-    <WriteLinesToFile File="$(PublishDir)\onnxruntime.pdb" Lines="" Overwrite="true" Encoding="Unicode" />
-  </Target>
-
 </Project>
diff --git a/runtime/dotnet/azurewebapp/Startup.cs b/runtime/dotnet/azurewebapp/Startup.cs
@@ -10,7 +10,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.AI.Luis;
-using Microsoft.Bot.Builder.AI.Orchestrator;
 using Microsoft.Bot.Builder.AI.QnA;
 using Microsoft.Bot.Builder.ApplicationInsights;
 using Microsoft.Bot.Builder.Azure;
@@ -105,7 +104,7 @@ public BotFrameworkHttpAdapter GetBotAdapter(IStorage storage, BotSettings setti
             var adapter = IsSkill(settings)
                 ? new BotFrameworkHttpAdapter(new ConfigurationCredentialProvider(this.Configuration), s.GetService<AuthenticationConfiguration>())
                 : new BotFrameworkHttpAdapter(new ConfigurationCredentialProvider(this.Configuration));
-            
+
             adapter
               .UseStorage(storage)
               .UseBotState(userState, conversationState)
@@ -151,7 +150,6 @@ public void ConfigureServices(IServiceCollection services)
             ComponentRegistration.Add(new LanguageGenerationComponentRegistration());
             ComponentRegistration.Add(new QnAMakerComponentRegistration());
             ComponentRegistration.Add(new LuisComponentRegistration());
-            ComponentRegistration.Add(new OrchestratorComponentRegistration());
 
             // This is for custom action component registration.
             //ComponentRegistration.Add(new CustomActionComponentRegistration());

diff --git a/runtime/dotnet/core/ComposerSettingsExtensions.cs b/runtime/dotnet/core/ComposerSettingsExtensions.cs
@@ -55,13 +55,6 @@ public static IConfigurationBuilder UseComposerSettings(this IConfigurationBuild
                 builder.AddJsonFile(qnaSettingsFile.FullName, optional: false, reloadOnChange: true);
             }
 
-            var orchestratorSettingsPath = Path.GetFullPath(Path.Combine(botRoot, "generated", "orchestrator.settings.json"));
-            var orchestratorSettingsFile = new FileInfo(orchestratorSettingsPath);
-            if (orchestratorSettingsFile.Exists)
-            {
-                builder.AddJsonFile(orchestratorSettingsFile.FullName, optional: false, reloadOnChange: true);
-            }
-
             return builder;
         }
     }