Skip to content
This repository has been archived by the owner on Apr 26, 2020. It is now read-only.

Unity 4.0.1 Support #29

Closed
wants to merge 2 commits into from
Closed

Unity 4.0.1 Support #29

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
f49e235
Updated to unit 4 (rebased)
cemremengu Aug 23, 2016
ea88a23
Fixed packages config and csproj
cemremengu Aug 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies/Nancy
Open in desktop
Submodule Nancy updated 133 files
18 changes: 11 additions & 7 deletions src/Nancy.Bootstrappers.Unity.MSBuild/Nancy.Bootstrappers.Unity.csproj
View file
Open in desktop
Expand Up @@ -34,16 +34,20 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.Unity, Version=2.1.505.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll</HintPath>
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=2.1.505.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll</HintPath>
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -85,4 +89,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/Nancy.Bootstrappers.Unity.MSBuild/packages.config
View file
Open in desktop
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
<package id="Unity" version="2.1.505.2" targetFramework="net45" />
<package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
<package id="Unity" version="4.0.1" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/Nancy.Bootstrappers.Unity/nancy.bootstrappers.unity.nuspec
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
<projectUrl>http://nancyfx.org</projectUrl>
<dependencies>
<dependency id="Nancy" />
<dependency id="Unity" version="2.1.505.2" />
<dependency id="Unity" version="4.0.1" />
</dependencies>
<tags>Nancy Unity</tags>
</metadata>
Expand Down
8 changes: 6 additions & 2 deletions src/Nancy.Bootstrappers.Unity/project.json
View file
Open in desktop
Expand Up @@ -12,10 +12,14 @@

"dependencies": {
"Nancy": { "target": "project" },
"Unity": "2.1.505.2"
"Unity": "4.0.1"
},

"frameworks": {
"net452": { }
"net452": {
"frameworkAssemblies": {
"System.Runtime": { "type": "build" }
}
}
}
}
16 changes: 10 additions & 6 deletions test/Nancy.Bootstrappers.Unity.Tests.MSBuild/Nancy.Bootstrappers.Unity.Tests.csproj
View file
Open in desktop
Expand Up @@ -35,16 +35,20 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.Unity, Version=2.1.505.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll</HintPath>
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=2.1.505.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll</HintPath>
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions test/Nancy.Bootstrappers.Unity.Tests.MSBuild/packages.config
View file
Open in desktop
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
<package id="Unity" version="2.1.505.2" targetFramework="net45" />
<package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
<package id="Unity" version="4.0.1" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
Expand Down
10 changes: 5 additions & 5 deletions test/Nancy.Bootstrappers.Unity.Tests/project.json
View file
Open in desktop
Expand Up @@ -9,13 +9,13 @@
},

"dependencies": {
"CommonServiceLocator": "1.0",
"dotnet-test-xunit": "1.0.0-rc3-build10019",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"CommonServiceLocator": "1.3.0",
"dotnet-test-xunit": "2.2.0-preview2-build1029",
"Microsoft.NETCore.Platforms": "1.0.1",
"Nancy": { "target": "project" },
"Nancy.Bootstrappers.Unity": { "target": "project" },
"Unity": "2.1.505.2",
"xunit": "2.1.0"
"Unity": "4.0.1",
"xunit": "2.2.0-beta2-build3300"
},

"frameworks": {
Expand Down