Skip to content

Commit 1bd4dc4

Browse files
committed
NoRing0 cleanup
1 parent 9cbdde7 commit 1bd4dc4

5 files changed

Lines changed: 2 additions & 31 deletions

File tree

client/client.sln

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|x64 = Debug|x64
1111
Release|x64 = Release|x64
12-
ReleaseNoRing0|x64 = ReleaseNoRing0|x64
1312
EndGlobalSection
1413
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1514
{9B614719-FEA4-4E3E-A5C3-7021E08A11FC}.Debug|x64.ActiveCfg = Debug|x64
1615
{9B614719-FEA4-4E3E-A5C3-7021E08A11FC}.Debug|x64.Build.0 = Debug|x64
1716
{9B614719-FEA4-4E3E-A5C3-7021E08A11FC}.Release|x64.ActiveCfg = Release|x64
1817
{9B614719-FEA4-4E3E-A5C3-7021E08A11FC}.Release|x64.Build.0 = Release|x64
19-
{9B614719-FEA4-4E3E-A5C3-7021E08A11FC}.ReleaseNoRing0|x64.ActiveCfg = ReleaseNoRing0|x64
20-
{9B614719-FEA4-4E3E-A5C3-7021E08A11FC}.ReleaseNoRing0|x64.Build.0 = ReleaseNoRing0|x64
2118
EndGlobalSection
2219
GlobalSection(SolutionProperties) = preSolution
2320
HideSolutionNode = FALSE

client/data/Methods/Hardware.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using System.Text;
1414
using System.ComponentModel;
1515
using static specify_client.Interop;
16-
using HidSharp.Utility;
1716

1817
namespace specify_client.data;
1918

client/data/Structs.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
#if !NORING
2-
using HidSharp;
3-
#endif
4-
using Microsoft.Win32;
1+
using Microsoft.Win32;
52
using Microsoft.Win32.TaskScheduler;
63
using Newtonsoft.Json;
74
using Newtonsoft.Json.Converters;
85
using System;
96
using System.Collections.Generic;
107
using System.IO;
11-
using System.IO.Ports;
128
using System.Linq;
139
using System.Runtime.CompilerServices;
1410
using System.Runtime.InteropServices;
15-
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
16-
using System.Security.Cryptography;
17-
using System.Windows.Documents;
18-
using System.Windows.Forms;
1911

2012
namespace specify_client.data;
2113

client/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HidSharp" version="2.1.0" targetFramework="net472" />
43
<package id="ILRepack.Lib.MSBuild.Task" version="2.0.34.1" targetFramework="net472" developmentDependency="true" />
54
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
65
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />

client/specify_client.csproj

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,6 @@
3737
<PlatformTarget>x64</PlatformTarget>
3838
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3939
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNoRing0|x64'">
41-
<DebugType>pdbonly</DebugType>
42-
<Optimize>true</Optimize>
43-
<DefineConstants>TRACE;NORING</DefineConstants>
44-
<AssemblyName>specify_client_noring0</AssemblyName>
45-
<ErrorReport>prompt</ErrorReport>
46-
<WarningLevel>4</WarningLevel>
47-
<Prefer32bit>false</Prefer32bit>
48-
<ApplicationManifest>app.manifest</ApplicationManifest>
49-
<OutputPath>bin\Release\</OutputPath>
50-
<PlatformTarget>x64</PlatformTarget>
51-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
52-
</PropertyGroup>
5340
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64'">
5441
<DebugSymbols>true</DebugSymbols>
5542
<DebugType>full</DebugType>
@@ -63,9 +50,6 @@
6350
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6451
</PropertyGroup>
6552
<ItemGroup>
66-
<Reference Include="HidSharp, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>packages\HidSharp.2.1.0\lib\net35\HidSharp.dll</HintPath>
68-
</Reference>
6953
<Reference Include="Microsoft.CSharp" />
7054
<Reference Include="Microsoft.Win32.TaskScheduler, Version=2.11.0.0, Culture=neutral, PublicKeyToken=e25603a88b3aa7da, processorArchitecture=MSIL">
7155
<HintPath>packages\TaskScheduler.2.11.0\lib\net45\Microsoft.Win32.TaskScheduler.dll</HintPath>
@@ -253,7 +237,7 @@
253237
</ItemGroup>
254238
<ItemGroup />
255239
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
256-
<Target Name="ILRepack" AfterTargets="Build" Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'ReleaseNoRing0'">
240+
<Target Name="ILRepack" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
257241
<PropertyGroup>
258242
<WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)</WorkingDirectory>
259243
</PropertyGroup>

0 commit comments

Comments
 (0)