Skip to content

Commit 999f47e

Browse files
committed
Fixing issue with runtime policy evaluation
1 parent e74710a commit 999f47e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/WebJobs.Script/Description/DotNet/FunctionAssemblyLoadContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ private static bool IsMinorMatchOrLowerPolicyEvaluator(AssemblyName requestedAss
154154
{
155155
AssemblyName runtimeAssemblyName = AssemblyNameCache.GetName(runtimeAssembly);
156156

157-
return requestedAssembly.Version.Major == runtimeAssemblyName.Version.Major &&
158-
requestedAssembly.Version.Minor <= runtimeAssemblyName.Version.Minor;
157+
return requestedAssembly.Version == null || (requestedAssembly.Version.Major == runtimeAssemblyName.Version.Major &&
158+
requestedAssembly.Version.Minor <= runtimeAssemblyName.Version.Minor);
159159
}
160160

161161
private bool IsRuntimeAssembly(AssemblyName assemblyName)

test/WebJobs.Script.Tests/Description/DotNet/FunctionAssemblyLoadContextTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public class FunctionAssemblyLoadContextTests
2828
[InlineData("Microsoft.Azure.WebJobs.Script, Version=3.0.0.0")]
2929
[InlineData("Microsoft.Azure.WebJobs.Script.Grpc, Version=3.0.0.0")]
3030
[InlineData("Microsoft.Azure.WebJobs.Script.WebHost, Version=3.0.0.0")]
31-
[InlineData("Microsoft.Azure.WebSites.DataProtection, Version=0.0.0.0")]
32-
[InlineData("System.IO, Version=0.0.0.0")] // System.*
31+
[InlineData("Microsoft.Azure.WebSites.DataProtection")]
32+
[InlineData("System.IO")] // System.*
3333
public void RuntimeAssemblies_AreLoadedInDefaultContext(string assemblyName)
3434
{
3535
var functionContext = new FunctionAssemblyLoadContext(AppContext.BaseDirectory);

0 commit comments

Comments
 (0)