updating private runtime assemblies list; re-adding System.Interactiv…

…e.Async (Azure#6208)
dadhi · Jun 10, 2020 · b8f3a74 · b8f3a74
1 parent 5b82896
commit b8f3a74
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -67,6 +67,8 @@
     <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="4.0.1" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.91-alpha" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
+    <!-- The System.Interactive.Async assembly is required to be deployed. See https://github.com/Azure/azure-functions-host/issues/6203 -->
+    <PackageReference Include="System.Interactive.Async" Version="3.2.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/WebJobs.Script/runtimeassemblies-relaxed.json b/src/WebJobs.Script/runtimeassemblies-relaxed.json
@@ -3,6 +3,26 @@
 // This list originally comes from dumping TPA assemblies. 
 {
   "runtimeAssemblies": [
+    {
+      "name": "Microsoft.Azure.KeyVault.Core",
+      "resolutionPolicy": "private"
+    },
+    {
+      "name": "Microsoft.OData.Core",
+      "resolutionPolicy": "private"
+    },
+    {
+      "name": "Microsoft.OData.Edm",
+      "resolutionPolicy": "private"
+    },
+    {
+      "name": "Microsoft.Spatial",
+      "resolutionPolicy": "private"
+    },
+    {
+      "name": "Microsoft.Azure.Storage.Common",
+      "resolutionPolicy": "private"
+    },
     {
       "name": "Microsoft.Azure.DocumentDB.Core",
       "resolutionPolicy": "private"

diff --git a/src/WebJobs.Script/runtimeassemblies.json b/src/WebJobs.Script/runtimeassemblies.json
@@ -2,6 +2,26 @@
 // This list originally comes from dumping TPA assemblies. 
 {
   "runtimeAssemblies": [
+    {
+      "name": "Microsoft.Azure.KeyVault.Core",
+      "resolutionPolicy": "private"
+    },
+    {
+      "name": "Microsoft.OData.Core",
+      "resolutionPolicy": "private"
+    },
+    {
+      "name": "Microsoft.OData.Edm",
+      "resolutionPolicy": "private"
+    },
+    {
+      "name": "Microsoft.Spatial",
+      "resolutionPolicy": "private"
+    },
+    {
+      "name": "Microsoft.Azure.Storage.Common",
+      "resolutionPolicy": "private"
+    },
     {
       "name": "Microsoft.Azure.DocumentDB.Core",
       "resolutionPolicy": "private"