Change nuget package references in projects (should fix compilation).

This commit is contained in:
2018-04-11 08:57:34 +01:00
parent 6bc424a25d
commit 9ea20d7d81
10 changed files with 43 additions and 71 deletions

View File

@@ -758,6 +758,7 @@
<e p="obj" t="ExcludeRecursive" /> <e p="obj" t="ExcludeRecursive" />
</e> </e>
<e p="DiscImageChef.Server" t="IncludeRecursive"> <e p="DiscImageChef.Server" t="IncludeRecursive">
<e p=".directory" t="Include" />
<e p="App_Start" t="Include"> <e p="App_Start" t="Include">
<e p="Ata.cs" t="Include" /> <e p="Ata.cs" t="Include" />
<e p="ScsiEvpd.cs" t="Include" /> <e p="ScsiEvpd.cs" t="Include" />
@@ -769,6 +770,7 @@
<e p="TestedMedia.cs" t="Include" /> <e p="TestedMedia.cs" t="Include" />
<e p="WebApiConfig.cs" t="Include" /> <e p="WebApiConfig.cs" t="Include" />
</e> </e>
<e p="ChangeLog" t="Include" />
<e p="Changelog.aspx" t="Include" /> <e p="Changelog.aspx" t="Include" />
<e p="Controllers" t="Include"> <e p="Controllers" t="Include">
<e p="UploadReportController.cs" t="Include" /> <e p="UploadReportController.cs" t="Include" />
@@ -817,6 +819,7 @@
<e p="usb.ids" t="Include" /> <e p="usb.ids" t="Include" />
</e> </e>
<e p="DiscImageChef.Settings" t="IncludeRecursive"> <e p="DiscImageChef.Settings" t="IncludeRecursive">
<e p=".DiscImageChef.Settings.csproj.kate-swp" t="Include" />
<e p="ChangeLog" t="Include" /> <e p="ChangeLog" t="Include" />
<e p="DiscImageChef.Settings.csproj" t="IncludeRecursive" /> <e p="DiscImageChef.Settings.csproj" t="IncludeRecursive" />
<e p="Properties" t="Include"> <e p="Properties" t="Include">

View File

@@ -35,9 +35,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Geometry.cs" /> <Compile Include="Geometry.cs" />
@@ -54,6 +51,9 @@
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>
<Properties> <Properties>

View File

@@ -35,9 +35,6 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ImageInfo.cs" /> <Compile Include="ImageInfo.cs" />
@@ -166,6 +163,9 @@
<Link>LICENSE</Link> <Link>LICENSE</Link>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>
<Properties> <Properties>

View File

@@ -34,28 +34,18 @@
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Claunia.Encoding, Version=1.4.6570.38892, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Claunia.Encoding.1.4.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.19.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96">
<HintPath>..\packages\SharpCompress.0.19.2\lib\net35\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="plist-cil">
<HintPath>..\packages\plist-cil.1.16.0\lib\net40\plist-cil.dll</HintPath>
</Reference>
<Reference Include="Claunia.RsrcFork">
<HintPath>..\packages\Claunia.RsrcFork.1.0.0\lib\net40\Claunia.RsrcFork.dll</HintPath>
</Reference>
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="DotNetZip">
<HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Claunia.Encoding" Version="1.6.1" />
<PackageReference Include="Claunia.RsrcFork" Version="1.0.0" />
<PackageReference Include="DotNetZip" Version="1.10.1" />
<PackageReference Include="plist-cil" Version="1.16.0" />
<PackageReference Include="SharpCompress" Version="0.20.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="DiscFerret.cs" /> <Compile Include="DiscFerret.cs" />
<Compile Include="DiscImageChef.cs" /> <Compile Include="DiscImageChef.cs" />

View File

@@ -34,15 +34,13 @@
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Claunia.Encoding, Version=1.4.6570.38892, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Claunia.Encoding.1.4.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Claunia.Encoding" Version="1.6.1" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="HPOFS.cs" /> <Compile Include="HPOFS.cs" />
<Compile Include="IReadOnlyFilesystem.cs" /> <Compile Include="IReadOnlyFilesystem.cs" />

View File

@@ -33,9 +33,6 @@
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="SharpCompress, Version=0.19.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96">
<HintPath>..\packages\SharpCompress.0.19.2\lib\net35\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -72,6 +69,9 @@
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="SharpCompress" Version="0.20.0" />
</ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>
<Properties> <Properties>

View File

@@ -46,25 +46,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.Http, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.4\lib\net45\System.Web.Http.WebHost.dll</HintPath>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Velyo.AspNet.Markdown">
<HintPath>..\packages\Velyo.AspNet.Markdown.1.0.26.6184\lib\net451\Velyo.AspNet.Markdown.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Global.asax" /> <Content Include="Global.asax" />
@@ -136,7 +121,12 @@
<Name>DiscImageChef.Decoders</Name> <Name>DiscImageChef.Decoders</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.4" />
<PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.4" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Velyo.AspNet.Markdown" Version="1.0.26.6184" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="int10h.org\vga_squarepx.woff2" /> <None Include="int10h.org\vga_squarepx.woff2" />
<None Include="usb.ids" /> <None Include="usb.ids" />

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -57,6 +57,9 @@
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="plist-cil" Version="1.16.0" />
</ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>
<Properties> <Properties>

View File

@@ -30,15 +30,6 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunitlite, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\packages\NUnitLite.3.9.0\lib\net45\nunitlite.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.19.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96">
<HintPath>..\packages\SharpCompress.0.19.2\lib\net45\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -187,6 +178,10 @@
<ItemGroup> <ItemGroup>
<Folder Include="Images\" /> <Folder Include="Images\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="NUnitLite" Version="3.10.1" />
<PackageReference Include="SharpCompress" Version="0.20.0" />
</ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>
<Properties> <Properties>

View File

@@ -38,20 +38,8 @@
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Claunia.Encoding, Version=1.4.6570.38892, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Claunia.Encoding.1.4.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.19.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96">
<HintPath>..\packages\SharpCompress.0.19.2\lib\net35\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="CommandLine">
<HintPath>..\packages\CommandLineParser.2.1.1-beta\lib\net40\CommandLine.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -271,4 +259,9 @@
<Content Include="..\.github\ISSUE_TEMPLATE.md" /> <Content Include="..\.github\ISSUE_TEMPLATE.md" />
<Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" /> <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Claunia.Encoding" Version="1.6.1" />
<PackageReference Include="CommandLineParser" Version="2.2.1" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
</Project> </Project>