Change frameworks to net45;netstandard2.0;net5.0

castleproject#564
generik0 · Nov 25, 2020 · 9fafb4d · 9fafb4d
1 parent 551fc2f
commit 9fafb4d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj b/src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
+		<TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>

diff --git a/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj b/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45;netcoreapp1.0</TargetFrameworks>
+		<TargetFrameworks>net45;net5.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -56,7 +56,7 @@
 		<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
 		<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
 	</ItemGroup>
 

diff --git a/src/Castle.Windsor.Tests/CircularDependencyTestCase.cs b/src/Castle.Windsor.Tests/CircularDependencyTestCase.cs
@@ -146,7 +146,7 @@ public string Path
 			{
 				get
 				{
-					var uriPath = new Uri(typeof(AssemblyPath).GetTypeInfo().Assembly.CodeBase);
+					var uriPath = new Uri(typeof(AssemblyPath).GetTypeInfo().Assembly.Location);
 					return uriPath.LocalPath;
 				}
 			}

diff --git a/src/Castle.Windsor/Castle.Windsor.csproj b/src/Castle.Windsor/Castle.Windsor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -33,10 +33,18 @@
 		<Reference Include="System.Web" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
-		<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
-		<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-		<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.2" />
-	</ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' OR '$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Castle.Windsor/MicroKernel/Lifestyle/Scoped/CallContextLifetimeScope.cs b/src/Castle.Windsor/MicroKernel/Lifestyle/Scoped/CallContextLifetimeScope.cs
@@ -120,18 +120,17 @@ private static void SetCurrentScope(CallContextLifetimeScope lifetimeScope)
 		[SecuritySafeCritical]
 		public static CallContextLifetimeScope ObtainCurrentScope()
 		{
+			object scopeKey;
 #if FEATURE_REMOTING
-			var scopeKey = CallContext.LogicalGetData(callContextKey);
+			scopeKey = CallContext.LogicalGetData(callContextKey);
 #else
-			var scopeKey = asyncLocal.Value;
+			scopeKey = asyncLocal.Value;
 #endif
-			if (scopeKey == null)
+			if (!(scopeKey is Guid))
 			{
 				return null;
 			}
-
-			CallContextLifetimeScope scope;
-			allScopes.TryGetValue((Guid)scopeKey, out scope);
+			allScopes.TryGetValue((Guid)scopeKey, out var scope);
 			return scope;
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,7 +146,7 @@ public string Path @@
     			{
     				get
     				{
-    					var uriPath = new Uri(typeof(AssemblyPath).GetTypeInfo().Assembly.CodeBase);
+    					var uriPath = new Uri(typeof(AssemblyPath).GetTypeInfo().Assembly.Location);
     					return uriPath.LocalPath;
     				}
     			}
@@ Expand Down @@