Change target framework from .NET Standard 1.6 to 2.0, and move .NET …

…Core tests to .NET 5
castleproject · Dec 10, 2020 · 3575883 · 3575883
1 parent 352fc1f
commit 3575883
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 49 deletions.
diff --git a/Castle.Windsor.sln b/Castle.Windsor.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2024
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30711.63
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Windsor", "src\Castle.Windsor\Castle.Windsor.csproj", "{5F6A631E-8EB1-4BC1-826D-86D3059945B8}"
 EndProject
@@ -27,8 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle Build", "Castle Buil
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildScripts", "buildscripts\BuildScripts.csproj", "{944CD23E-BEF8-4FBC-A76D-7BC85A7FB2F6}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle Facilities", "Castle Facilities", "{7935AFF5-BF6D-4D59-8D66-058B6557F70F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Facilities.AspNetCore", "src\Castle.Facilities.AspNetCore\Castle.Facilities.AspNetCore.csproj", "{B7A06282-CE20-4C9E-B050-6954F3537ED0}"
@@ -55,6 +53,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Windsor.Extensions.D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Windsor.Extensions.DependencyInjection.Tests", "src\Castle.Windsor.Extensions.DependencyInjection.Tests\Castle.Windsor.Extensions.DependencyInjection.Tests.csproj", "{7C2F5733-0E06-4201-A15A-1ED1F3308DB4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScripts", "{DD7F7887-F27C-4C52-AA41-0F386D4D9996}"
+	ProjectSection(SolutionItems) = preProject
+		buildscripts\ASL - Apache Software Foundation License.txt = buildscripts\ASL - Apache Software Foundation License.txt
+		buildscripts\build.cmd = buildscripts\build.cmd
+		buildscripts\CastleKey.snk = buildscripts\CastleKey.snk
+		buildscripts\common.props = buildscripts\common.props
+		buildscripts\CommonAssemblyInfo.cs = buildscripts\CommonAssemblyInfo.cs
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,10 +92,6 @@ Global
 		{11D01568-6DB2-4F82-859F-FB288A8CA694}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11D01568-6DB2-4F82-859F-FB288A8CA694}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11D01568-6DB2-4F82-859F-FB288A8CA694}.Release|Any CPU.Build.0 = Release|Any CPU
-		{944CD23E-BEF8-4FBC-A76D-7BC85A7FB2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{944CD23E-BEF8-4FBC-A76D-7BC85A7FB2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{944CD23E-BEF8-4FBC-A76D-7BC85A7FB2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{944CD23E-BEF8-4FBC-A76D-7BC85A7FB2F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B7A06282-CE20-4C9E-B050-6954F3537ED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B7A06282-CE20-4C9E-B050-6954F3537ED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B7A06282-CE20-4C9E-B050-6954F3537ED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,7 +145,6 @@ Global
 		{BA6B28A7-C965-4F7E-8B1A-DF5171E7976B} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 		{2162E27E-E0EB-470A-95FD-9AD6B802D0AB} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 		{148CDE3A-7633-4C20-8E7E-24D5919ABACF} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
-		{944CD23E-BEF8-4FBC-A76D-7BC85A7FB2F6} = {7E507A42-984B-470D-8A0C-648B9AF8E1DC}
 		{B7A06282-CE20-4C9E-B050-6954F3537ED0} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 		{EC869097-F284-47BB-8FF0-ED480C5068A4} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 		{225643EF-E982-4367-A3DB-8FF33CD7BE43} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
@@ -154,6 +156,7 @@ Global
 		{5CD7AE3F-105F-4C7A-940D-B7D130940E66} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 		{7710F8A2-33D8-40C1-89F5-648577B5DD01} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
 		{7C2F5733-0E06-4201-A15A-1ED1F3308DB4} = {7935AFF5-BF6D-4D59-8D66-058B6557F70F}
+		{DD7F7887-F27C-4C52-AA41-0F386D4D9996} = {7E507A42-984B-470D-8A0C-648B9AF8E1DC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CC2A1EB6-49EC-4064-AD8B-29439E8A45E4}

diff --git a/buildscripts/BuildScripts.csproj b/buildscripts/BuildScripts.csproj
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</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>

diff --git a/...ions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj b/...ions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 

diff --git a/...ndsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj b/...ndsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.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,10 +56,6 @@
 		<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
-		<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
-	</ItemGroup>
-
 	<ItemGroup>
     <ProjectReference Include="..\Castle.Facilities.Logging\Castle.Facilities.Logging.csproj" />
 		<ProjectReference Include="..\Castle.Windsor\Castle.Windsor.csproj" />

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</TargetFrameworks>
 	</PropertyGroup>
 
 	<Import Project="..\..\buildscripts\common.props"></Import>
@@ -33,10 +33,9 @@
 		<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'">
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Castle.Windsor/MicroKernel/Lifestyle/Scoped/CallContextLifetimeScope.cs b/src/Castle.Windsor/MicroKernel/Lifestyle/Scoped/CallContextLifetimeScope.cs
@@ -122,18 +122,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 @@