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

Jump to bottom

Upgrade to Castle.Core 4.4.0 / Castle.Windsor 5.0.0 #6

Merged
merged 2 commits into from
Aug 5, 2019
Merged

Upgrade to Castle.Core 4.4.0 / Castle.Windsor 5.0.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810bafe
Upgrade to Castle.Core 4.4.0, Castle.Windsor 5.0.0
dvdwouwe Jul 24, 2019
d955194
Adjust nuspec files after upgrade to Castle.Core 4.4.0, Castle.Windso…
dvdwouwe Jul 24, 2019
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
8 changes: 4 additions & 4 deletions AppConfigFacility.Azure/AppConfigFacility.Azure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<DocumentationFile>bin\Release\AppConfigFacility.Azure.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<HintPath>..\packages\Castle.Windsor.5.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions AppConfigFacility.Azure/AppConfigFacility.Azure.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<dependencies>
<dependency id="WindsorAppConfigFacility" version="$version$" />
<dependency id="Castle.Core" version="4.0.0" />
<dependency id="Castle.Windsor" version="4.0.0" />
<dependency id="Castle.Core" version="[4.4.0, 5.0.0)" />
<dependency id="Castle.Windsor" version="[5.0.0, 6.0.0)" />
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" />
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions AppConfigFacility.Azure/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
<package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
<package id="Castle.Core" version="4.4.0" targetFramework="net45" />
<package id="Castle.Windsor" version="5.0.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" targetFramework="net45" />
</packages>
8 changes: 4 additions & 4 deletions AppConfigFacility/AppConfigFacility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<DocumentationFile>bin\Release\AppConfigFacility.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<HintPath>..\packages\Castle.Windsor.5.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions AppConfigFacility/AppConfigFacility.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<releaseNotes>Updated to use Windsor IConversionManager instead of Convert.ChangeType().</releaseNotes>

<dependencies>
<dependency id="Castle.Core" version="4.0.0" />
<dependency id="Castle.Windsor" version="4.0.0" />
<dependency id="Castle.Core" version="[4.4.0, 5.0.0)" />
<dependency id="Castle.Windsor" version="[5.0.0, 6.0.0)" />
</dependencies>
</metadata>

Expand Down
4 changes: 2 additions & 2 deletions AppConfigFacility/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
<package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
<package id="Castle.Core" version="4.4.0" targetFramework="net45" />
<package id="Castle.Windsor" version="5.0.0" targetFramework="net45" />
</packages>
8 changes: 4 additions & 4 deletions Tests/AppConfigFacility.Azure.Tests/AppConfigFacility.Azure.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<HintPath>..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<HintPath>..\..\packages\Castle.Windsor.5.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions Tests/AppConfigFacility.Azure.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
<package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
<package id="Castle.Core" version="4.4.0" targetFramework="net45" />
<package id="Castle.Windsor" version="5.0.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net45" />
</packages>
8 changes: 4 additions & 4 deletions Tests/AppConfigFacility.Tests/AppConfigFacility.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<HintPath>..\..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
<HintPath>..\..\packages\Castle.Windsor.5.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq">
Expand Down
6 changes: 4 additions & 2 deletions Tests/AppConfigFacility.Tests/Unit/AppConfigInterceptorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace AppConfigFacility.Tests.Unit
using Castle.MicroKernel;

namespace AppConfigFacility.Tests.Unit
{
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -42,7 +44,7 @@ public void Intercept_AppendsPrefixIfSpecified()
interceptor.SetInterceptedComponentModel(
new ComponentModel(new ComponentName("AppConfigInterceptorTests", false),
new List<Type> {typeof (AppConfigInterceptorTests)}, typeof (AppConfigInterceptorTests),
new Dictionary<string, object> {{AppConfigInterceptor.PrefixKey, "SomePrefix:"}}));
Arguments.FromNamed(new []{ new KeyValuePair<string, object>(AppConfigInterceptor.PrefixKey, "SomePrefix:") })));

_settingsProvider.Setup(p => p.GetSetting("SomePrefix:Name", typeof(string))).Returns("My Name");
var invocation =
Expand Down
4 changes: 2 additions & 2 deletions Tests/AppConfigFacility.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
<package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
<package id="Castle.Core" version="4.4.0" targetFramework="net45" />
<package id="Castle.Windsor" version="5.0.0" targetFramework="net45" />
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
<package id="MSBuildTasks" version="1.4.0.78" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net45" />
Expand Down