Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change target framework from .NET Standard 1.6 to 2.0, and move .NET Core tests to .NET 5 #572

Merged
merged 17 commits into from
Dec 10, 2020
Merged

Change target framework from .NET Standard 1.6 to 2.0, and move .NET Core tests to .NET 5 #572

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9fafb4d
Change frameworks to net45;netstandard2.0;net5.0
generik0 Nov 25, 2020
35ac203
Update testing frameworks
generik0 Nov 26, 2020
3f40dab
Update to Castle.Core 4.4.1
generik0 Nov 29, 2020
beaca14
change 261 to netcoreapp3.1 as it will also test .netstandard sdk
generik0 Nov 29, 2020
caa99c8
Chnage build to only use net5.0, no need for unix longer
generik0 Nov 29, 2020
a43692a
Remove netcoreapp 2.2 from tests as it is no longer needed
generik0 Dec 3, 2020
266fd9a
Remove unneeded BuildScripts project and manually add build scripts t…
generik0 Dec 7, 2020
0c5f13b
Merge remote-tracking branch 'castle.windsor/master' into feature/564…
generik0 Dec 7, 2020
41d7d5e
Test Castle.Windsor with net45 and net5.0
generik0 Dec 7, 2020
9cc5fa1
Build Castle.Windsor with net45 and netstandard2.0
generik0 Dec 7, 2020
d253d3c
Build Castle.Windsor.Extensions.DependencyInjection with netstandard2.0
generik0 Dec 7, 2020
199e5ee
Build Castle.Facilities.Logging with net45;netstandard2.0
generik0 Dec 7, 2020
b3b0494
Test Castle.Windsor.Extensions.DependencyInjection.Tests with net5.0
generik0 Dec 7, 2020
f2ad75f
Clean up package references for netstandard2.0
generik0 Dec 9, 2020
055afbe
Revert Microsoft.Extensions.DependencyModel back to Version="1.1.2"
generik0 Dec 9, 2020
63ea95f
Removed netcoreapp1.0 from Castle.Windsor.Tests
generik0 Dec 9, 2020
34cc9b7
Update Microsoft.Extensions.DependencyModel to Version="2.1.0" in Ca…
generik0 Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions Castle.Windsor.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down
18 changes: 0 additions & 18 deletions buildscripts/BuildScripts.csproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Castle.Facilities.Logging/Castle.Facilities.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ions.DependencyInjection.Tests/Castle.Windsor.Extensions.DependencyInjection.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion ...ndsor.Extensions.DependencyInjection/Castle.Windsor.Extensions.DependencyInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Castle.Windsor.Tests/CircularDependencyTestCase.cs
View file
Open in desktop
Original file line number Diff 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
22 changes: 15 additions & 7 deletions src/Castle.Windsor/Castle.Windsor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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'">
generik0 marked this conversation as resolved.
Show resolved Hide resolved
<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>
generik0 marked this conversation as resolved.
Show resolved Hide resolved

<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
</ItemGroup>
generik0 marked this conversation as resolved.
Show resolved Hide resolved

</Project>
11 changes: 5 additions & 6 deletions src/Castle.Windsor/MicroKernel/Lifestyle/Scoped/CallContextLifetimeScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down