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

Commit

Permalink
Merge pull request antonpup#1995 from diogotr7/feature/packagereference
Browse files Browse the repository at this point in the history
Removed and updated packages
  • Loading branch information
diogotr7 authored May 5, 2020
2 parents b5c5b8a + 89265e8 commit ef9d66d
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 3,278 deletions.
25 changes: 11 additions & 14 deletions Project-Aurora/Aurora-Updater/Aurora-Updater.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,6 @@
<ApplicationIcon>Resources\Aurora_updater.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ionic.Zip.Reduced, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.Reduced.1.9.1.8\lib\net20\Ionic.Zip.Reduced.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Octokit, Version=0.29.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Octokit.0.29.0\lib\net45\Octokit.dll</HintPath>
</Reference>
<Reference Include="SemVer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=a89bb7dc6f7a145c, processorArchitecture=MSIL">
<HintPath>..\packages\SemanticVersioning.1.2.0\lib\net45\SemVer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand Down Expand Up @@ -138,7 +125,6 @@
<EmbeddedResource Include="UpdateInfoForm.resx">
<DependentUpon>UpdateInfoForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down Expand Up @@ -167,6 +153,17 @@
<Name>Project-Aurora</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="Octokit">
<Version>0.47.0</Version>
</PackageReference>
<PackageReference Include="SemanticVersioning">
<Version>1.2.2</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
7 changes: 0 additions & 7 deletions Project-Aurora/Aurora-Updater/packages.config

This file was deleted.

9 changes: 5 additions & 4 deletions Project-Aurora/Plugin-Example/Plugin-Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="Xceed.Wpf.Toolkit, Version=2.9.15603.14400, Culture=neutral, PublicKeyToken=ba83ff368b7563c6, processorArchitecture=MSIL">
<HintPath>..\packages\Xceed.Wpf.Toolkit.2.9.15603.14400\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Layers\Control_ExampleLayer.xaml.cs">
Expand Down Expand Up @@ -78,7 +75,11 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xceed.Wpf.Toolkit">
<Version>2.9.15603.14400</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
4 changes: 0 additions & 4 deletions Project-Aurora/Plugin-Example/packages.config

This file was deleted.

30 changes: 0 additions & 30 deletions Project-Aurora/Project-Aurora.sln
Original file line number Diff line number Diff line change
Expand Up @@ -34,78 +34,48 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NZXTSharp", "..\NZXTSharp\N
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{18D2D471-3F57-4ECE-9C62-836A801473D8}.Debug|Any CPU.ActiveCfg = Debug|x64
{18D2D471-3F57-4ECE-9C62-836A801473D8}.Debug|x64.ActiveCfg = Debug|x64
{18D2D471-3F57-4ECE-9C62-836A801473D8}.Debug|x64.Build.0 = Debug|x64
{18D2D471-3F57-4ECE-9C62-836A801473D8}.Release|Any CPU.ActiveCfg = Release|x64
{18D2D471-3F57-4ECE-9C62-836A801473D8}.Release|x64.ActiveCfg = Release|x64
{18D2D471-3F57-4ECE-9C62-836A801473D8}.Release|x64.Build.0 = Release|x64
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Debug|Any CPU.ActiveCfg = Debug|Win32
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Debug|x64.ActiveCfg = Release|x64
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Debug|x64.Build.0 = Release|x64
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Release|Any CPU.ActiveCfg = Release|Win32
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Release|x64.ActiveCfg = Release|x64
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Release|x64.Build.0 = Release|x64
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Debug|Any CPU.ActiveCfg = Debug|Win32
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Debug|x64.ActiveCfg = Release|x64
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Debug|x64.Build.0 = Release|x64
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Release|Any CPU.ActiveCfg = Release|Win32
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Release|x64.ActiveCfg = Release|x64
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Release|x64.Build.0 = Release|x64
{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Debug|x64.ActiveCfg = Debug|x64
{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Debug|x64.Build.0 = Debug|x64
{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Release|Any CPU.Build.0 = Release|Any CPU
{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Release|x64.ActiveCfg = Release|x64
{6F81D40A-6AA0-4C8B-A395-779EF3003CA4}.Release|x64.Build.0 = Release|x64
{7A7C78E5-0307-4139-9625-401A5A56C51F}.Debug|Any CPU.ActiveCfg = Debug|Win32
{7A7C78E5-0307-4139-9625-401A5A56C51F}.Debug|x64.ActiveCfg = Release|x64
{7A7C78E5-0307-4139-9625-401A5A56C51F}.Debug|x64.Build.0 = Release|x64
{7A7C78E5-0307-4139-9625-401A5A56C51F}.Release|Any CPU.ActiveCfg = Release|Win32
{7A7C78E5-0307-4139-9625-401A5A56C51F}.Release|x64.ActiveCfg = Release|x64
{7A7C78E5-0307-4139-9625-401A5A56C51F}.Release|x64.Build.0 = Release|x64
{A759300D-9550-47BA-8616-C24B6BC05A02}.Debug|Any CPU.ActiveCfg = Debug|Win32
{A759300D-9550-47BA-8616-C24B6BC05A02}.Debug|x64.ActiveCfg = Release|x64
{A759300D-9550-47BA-8616-C24B6BC05A02}.Debug|x64.Build.0 = Release|x64
{A759300D-9550-47BA-8616-C24B6BC05A02}.Release|Any CPU.ActiveCfg = Release|Win32
{A759300D-9550-47BA-8616-C24B6BC05A02}.Release|x64.ActiveCfg = Release|x64
{A759300D-9550-47BA-8616-C24B6BC05A02}.Release|x64.Build.0 = Release|x64
{40085232-ACED-4CBE-945B-90BA8153C151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40085232-ACED-4CBE-945B-90BA8153C151}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40085232-ACED-4CBE-945B-90BA8153C151}.Debug|x64.ActiveCfg = Debug|Any CPU
{40085232-ACED-4CBE-945B-90BA8153C151}.Debug|x64.Build.0 = Debug|Any CPU
{40085232-ACED-4CBE-945B-90BA8153C151}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40085232-ACED-4CBE-945B-90BA8153C151}.Release|Any CPU.Build.0 = Release|Any CPU
{40085232-ACED-4CBE-945B-90BA8153C151}.Release|x64.ActiveCfg = Release|Any CPU
{40085232-ACED-4CBE-945B-90BA8153C151}.Release|x64.Build.0 = Release|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Debug|x64.ActiveCfg = Debug|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Debug|x64.Build.0 = Debug|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|Any CPU.Build.0 = Release|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|x64.ActiveCfg = Release|Any CPU
{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|x64.Build.0 = Release|Any CPU
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|Any CPU.ActiveCfg = Debug|Win32
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|x64.ActiveCfg = Debug|x64
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|x64.Build.0 = Debug|x64
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Release|Any CPU.ActiveCfg = Release|Win32
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Release|x64.ActiveCfg = Release|x64
{053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Release|x64.Build.0 = Release|x64
{62094023-0479-4DD4-8A74-4321CC0F08DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62094023-0479-4DD4-8A74-4321CC0F08DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62094023-0479-4DD4-8A74-4321CC0F08DD}.Debug|x64.ActiveCfg = Debug|Any CPU
{62094023-0479-4DD4-8A74-4321CC0F08DD}.Debug|x64.Build.0 = Debug|Any CPU
{62094023-0479-4DD4-8A74-4321CC0F08DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62094023-0479-4DD4-8A74-4321CC0F08DD}.Release|Any CPU.Build.0 = Release|Any CPU
{62094023-0479-4DD4-8A74-4321CC0F08DD}.Release|x64.ActiveCfg = Release|Any CPU
{62094023-0479-4DD4-8A74-4321CC0F08DD}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
1 change: 0 additions & 1 deletion Project-Aurora/Project-Aurora/Devices/LightFX/LightFX.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Aurora.Settings;
using System.ComponentModel;
using System.Runtime.InteropServices;
using MiscUtil.Linq.Extensions;
using Microsoft.Win32.SafeHandles;
using System.IO;
using System.Net.Sockets;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.ComponentModel;
using System.Linq;
using Aurora.Settings;
using RGB.NET.Brushes;
using RGB.NET.Core;
using RGB.NET.Devices.Corsair;
using RGB.NET.Groups;
Expand Down
Loading

0 comments on commit ef9d66d

Please sign in to comment.