Skip to content

Commit

Permalink
(#508) Update package references to new libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheCakeIsNaOH
TheCakeIsNaOH committed Jun 17, 2022
1 parent f6dfa03 commit c0d372c
Show file tree
Hide file tree
Showing 15 changed files with 120 additions and 6 deletions.
11 changes: 11 additions & 0 deletions src/chocolatey.console/app.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Web.XmlTransform" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
1 change: 1 addition & 0 deletions src/chocolatey.console/chocolatey.console.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<EmbeddedResource Include="choco.exe.manifest">
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="targets\Microsoft.Application.targets" />
</ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions src/chocolatey.tests/chocolatey.tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="NuGet.Common, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Common.6.2.1\lib\net472\NuGet.Common.dll</HintPath>
</Reference>
<Reference Include="NuGet.Frameworks, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Frameworks.6.2.1\lib\net472\NuGet.Frameworks.dll</HintPath>
</Reference>
<Reference Include="NuGet.Versioning, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Versioning.6.2.1\lib\net472\NuGet.Versioning.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
Expand All @@ -80,6 +89,7 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
56 changes: 53 additions & 3 deletions src/chocolatey/chocolatey.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,51 @@
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.12\lib\net40-client\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
<Reference Include="Microsoft.Build" />
<Reference Include="Microsoft.Web.XmlTransform, Version=3.0.0.34420, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NuGet.Commands, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Commands.6.2.1\lib\net472\NuGet.Commands.dll</HintPath>
</Reference>
<Reference Include="NuGet.Common, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Common.6.2.1\lib\net472\NuGet.Common.dll</HintPath>
</Reference>
<Reference Include="NuGet.Configuration, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Configuration.6.2.1\lib\net472\NuGet.Configuration.dll</HintPath>
</Reference>
<Reference Include="NuGet.Credentials, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Credentials.6.2.1\lib\net472\NuGet.Credentials.dll</HintPath>
</Reference>
<Reference Include="NuGet.DependencyResolver.Core, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.DependencyResolver.Core.6.2.1\lib\net472\NuGet.DependencyResolver.Core.dll</HintPath>
</Reference>
<Reference Include="NuGet.Frameworks, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Frameworks.6.2.1\lib\net472\NuGet.Frameworks.dll</HintPath>
</Reference>
<Reference Include="NuGet.LibraryModel, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.LibraryModel.6.2.1\lib\net472\NuGet.LibraryModel.dll</HintPath>
</Reference>
<Reference Include="NuGet.PackageManagement, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.PackageManagement.6.2.1\lib\net472\NuGet.PackageManagement.dll</HintPath>
</Reference>
<Reference Include="NuGet.Packaging, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Packaging.6.2.1\lib\net472\NuGet.Packaging.dll</HintPath>
</Reference>
<Reference Include="NuGet.ProjectModel, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.ProjectModel.6.2.1\lib\net472\NuGet.ProjectModel.dll</HintPath>
</Reference>
<Reference Include="NuGet.Protocol, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Protocol.6.2.1\lib\net472\NuGet.Protocol.dll</HintPath>
</Reference>
<Reference Include="NuGet.Resolver, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Resolver.6.2.1\lib\net472\NuGet.Resolver.dll</HintPath>
</Reference>
<Reference Include="NuGet.Versioning, Version=6.2.1.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\NuGet.Versioning.6.2.1\lib\net472\NuGet.Versioning.dll</HintPath>
</Reference>
<Reference Include="Rhino.Licensing">
<HintPath>..\..\lib\Rhino.Licensing.1.4.1\lib\net40\Rhino.Licensing.dll</HintPath>
Expand All @@ -87,13 +128,20 @@
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net40-client\SimpleInjector.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Management.Automation">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\PowerShell\System.Management.Automation.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net40\System.Reactive.Core.dll</HintPath>
</Reference>
Expand All @@ -104,6 +152,7 @@
<HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net40\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Security" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -389,6 +438,7 @@
<ItemGroup>
<EmbeddedResource Include="infrastructure\logging\log4net.mono.nocolor.config.xml" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project=".\targets\Microsoft.Application.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 2 additions & 0 deletions src/chocolatey/infrastructure.app/commands/ChocolateyPinCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ namespace chocolatey.infrastructure.app.commands
using infrastructure.configuration;
using logging;
using nuget;
using NuGet.Common;
using NuGet.Versioning;
using services;

[CommandFor("pin", "suppress upgrades for a package")]
Expand Down
2 changes: 2 additions & 0 deletions src/chocolatey/infrastructure.app/nuget/ChocolateyNugetLogger.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ namespace chocolatey.infrastructure.app.nuget
{
using logging;
using NuGet;
using NuGet.Common;
using System.Threading.Tasks;

// ReSharper disable InconsistentNaming

Expand Down
5 changes: 5 additions & 0 deletions src/chocolatey/infrastructure.app/nuget/NugetCommon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@ namespace chocolatey.infrastructure.app.nuget
using infrastructure.configuration;
using NuGet;
using configuration;
using filesystem;
using logging;
using NuGet.Common;
using NuGet.Configuration;
using NuGet.Packaging;
using Console = adapters.Console;
using Environment = adapters.Environment;
using WebProxy = System.Net.WebProxy;

// ReSharper disable InconsistentNaming

Expand Down
3 changes: 3 additions & 0 deletions src/chocolatey/infrastructure.app/nuget/NugetPack.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ namespace chocolatey.infrastructure.app.nuget
using NuGet;
using IFileSystem = filesystem.IFileSystem;
using chocolatey.infrastructure.platforms;
using NuGet.Common;
using NuGet.Configuration;
using NuGet.Packaging;

// ReSharper disable InconsistentNaming

Expand Down
7 changes: 6 additions & 1 deletion src/chocolatey/infrastructure.app/nuget/NugetPush.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@
namespace chocolatey.infrastructure.app.nuget
{
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using NuGet;
using configuration;
using logging;
using NuGet.Protocol;
using NuGet.Commands;
using NuGet.Configuration;
using NuGet.Protocol.Core.Types;

public class NugetPush
{
Expand Down
3 changes: 3 additions & 0 deletions src/chocolatey/infrastructure.app/registration/ContainerBinding.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ namespace chocolatey.infrastructure.app.registration
using infrastructure.services;
using infrastructure.validations;
using nuget;
using NuGet.Common;
using NuGet.PackageManagement;
using NuGet.Packaging;
using services;
using tasks;
using validations;
Expand Down
1 change: 1 addition & 0 deletions src/chocolatey/infrastructure.app/services/ChocolateyPackageInformationService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace chocolatey.infrastructure.app.services
using NuGet;
using domain;
using infrastructure.configuration;
using NuGet.Versioning;
using tolerance;
using IFileSystem = filesystem.IFileSystem;

Expand Down
5 changes: 5 additions & 0 deletions src/chocolatey/infrastructure.app/services/NugetService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ namespace chocolatey.infrastructure.app.services
using Environment = System.Environment;
using IFileSystem = filesystem.IFileSystem;
using chocolatey.infrastructure.app.utility;
using NuGet.Common;
using NuGet.Configuration;
using NuGet.PackageManagement;
using NuGet.Packaging;
using NuGet.Versioning;

//todo: #2575 - this monolith is too large. Refactor once test coverage is up.

Expand Down
1 change: 1 addition & 0 deletions src/chocolatey/infrastructure.app/services/TemplateService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ namespace chocolatey.infrastructure.app.services
using tokens;
using NuGet;
using nuget;
using NuGet.Common;
using IFileSystem = filesystem.IFileSystem;

public class TemplateService : ITemplateService
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey/infrastructure/results/PackageResult.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace chocolatey.infrastructure.results
using System;
using System.Collections.Generic;
using System.Linq;
using NuGet;
using NuGet.Packaging;

/// <summary>
/// Outcome of package installation
Expand Down
17 changes: 16 additions & 1 deletion src/chocolatey/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,22 @@
<packages>
<package id="AlphaFS" version="2.1.3" targetFramework="net40-client" requireReinstallation="true" />
<package id="log4net" version="2.0.12" targetFramework="net40-client" requireReinstallation="true" />
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="net48" />
<package id="Microsoft.Web.Xdt" version="3.0.0" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
<package id="NuGet.Commands" version="6.2.1" targetFramework="net48" />
<package id="NuGet.Common" version="6.2.1" targetFramework="net48" />
<package id="NuGet.Configuration" version="6.2.1" targetFramework="net48" />
<package id="NuGet.Credentials" version="6.2.1" targetFramework="net48" />
<package id="NuGet.DependencyResolver.Core" version="6.2.1" targetFramework="net48" />
<package id="NuGet.Frameworks" version="6.2.1" targetFramework="net48" />
<package id="NuGet.LibraryModel" version="6.2.1" targetFramework="net48" />
<package id="NuGet.PackageManagement" version="6.2.1" targetFramework="net48" />
<package id="NuGet.Packaging" version="6.2.1" targetFramework="net48" />
<package id="NuGet.ProjectModel" version="6.2.1" targetFramework="net48" />
<package id="NuGet.Protocol" version="6.2.1" targetFramework="net48" />
<package id="NuGet.Resolver" version="6.2.1" targetFramework="net48" />
<package id="NuGet.Versioning" version="6.2.1" targetFramework="net48" />
<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" />
Expand Down

0 comments on commit c0d372c

Please sign in to comment.