Skip to content

Commit

Permalink
(chocolateyGH-458) Retarget to .NET 4.5 nuget assemblies
Browse files Browse the repository at this point in the history 
NuGet detected that some assemblies required that they be
reinstalled/retargeted to take advantage of the newer assembly
framework.
  • Loading branch information
@ferventcoder
ferventcoder committed Oct 11, 2015
1 parent 40798f4 commit 0c171b3
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 28 deletions.
8 changes: 6 additions & 2 deletions src/chocolatey.console/chocolatey.console.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\NuGet-Chocolatey\NuGet.Core.dll</HintPath>
</Reference>
<Reference Include="SimpleInjector">
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net40-client\SimpleInjector.dll</HintPath>
<Reference Include="SimpleInjector, Version=2.5.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.dll</HintPath>
</Reference>
<Reference Include="SimpleInjector.Diagnostics">
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.Diagnostics.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey.console/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
<package id="Nuget.Core" version="2.8.2" targetFramework="net40" />
<package id="PublishedApplications" version="2.4.0.0" targetFramework="net40" />
<package id="SimpleInjector" version="2.5.0" targetFramework="net40" requireReinstallation="True" />
<package id="SimpleInjector" version="2.5.0" targetFramework="net452" />
</packages>
25 changes: 15 additions & 10 deletions src/chocolatey.tests.integration/chocolatey.tests.integration.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,27 @@
<Reference Include="Should, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Should.1.1.12.0\lib\Should.dll</HintPath>
</Reference>
<Reference Include="SimpleInjector, Version=2.5.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net40-client\SimpleInjector.dll</HintPath>
<Reference Include="SimpleInjector">
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SimpleInjector.Diagnostics">
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net40-client\SimpleInjector.Diagnostics.dll</HintPath>
<Reference Include="SimpleInjector.Diagnostics, Version=2.5.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.Diagnostics.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net40\System.Reactive.Core.dll</HintPath>
<Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net40\System.Reactive.Interfaces.dll</HintPath>
<Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net40\System.Reactive.Linq.dll</HintPath>
<Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
8 changes: 4 additions & 4 deletions src/chocolatey.tests.integration/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<package id="Moq" version="4.2.1402.2112" targetFramework="net40" />
<package id="NuGet.Core" version="2.8.2" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net40" requireReinstallation="True" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net40" requireReinstallation="True" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net40" requireReinstallation="True" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net452" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net452" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net452" />
<package id="Should" version="1.1.12.0" />
<package id="SimpleInjector" version="2.5.0" targetFramework="net40" requireReinstallation="True" />
<package id="SimpleInjector" version="2.5.0" targetFramework="net452" />
</packages>
21 changes: 14 additions & 7 deletions src/chocolatey/chocolatey.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,26 @@
<HintPath>..\..\lib\Rhino.Licensing\Rhino.Licensing.dll</HintPath>
</Reference>
<Reference Include="SimpleInjector">
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net40-client\SimpleInjector.dll</HintPath>
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SimpleInjector.Diagnostics">
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.Diagnostics.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net40\System.Reactive.Core.dll</HintPath>
<Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net40\System.Reactive.Interfaces.dll</HintPath>
<Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net40\System.Reactive.Linq.dll</HintPath>
<Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Security" />
<Reference Include="System.Xml.Linq" />
Expand Down
8 changes: 4 additions & 4 deletions src/chocolatey/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
<package id="NuGet.Core" version="2.8.2" targetFramework="net40" />
<package id="PublishedApplications" version="2.4.0.0" targetFramework="net40" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net40" requireReinstallation="True" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net40" requireReinstallation="True" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net40" requireReinstallation="True" />
<package id="SimpleInjector" version="2.5.0" targetFramework="net40" requireReinstallation="True" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net452" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net452" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net452" />
<package id="SimpleInjector" version="2.5.0" targetFramework="net452" />
</packages>

0 comments on commit 0c171b3

Please sign in to comment.