Skip to content

Commit 3bd46be

Browse files
author
ntminer
committed
.net45
1 parent 7f025f2 commit 3bd46be

File tree

158 files changed

+4138
-1774
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+4138
-1774
lines changed

‎NTMiner.sln‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E66C9F7C-617A-4E97-978A-A06E3A95BEE8}"
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{43C57D59-9DC7-45AE-9D09-5D3D413E41EC}"
13-
ProjectSection(SolutionItems) = preProject
14-
docs\Server\README.md = docs\Server\README.md
15-
EndProjectSection
1613
EndProject
1714
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevConsole", "src\DevConsole\DevConsole.csproj", "{56216641-FA69-46BD-AD32-C31F9FA735C8}"
1815
EndProject

‎src/AppModels/AppModels.csproj‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>NTMiner</RootNamespace>
1111
<AssemblyName>AppModels</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>false</Deterministic>
15+
<TargetFrameworkProfile />
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1518
</PropertyGroup>
1619
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1720
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +24,7 @@
2124
<DefineConstants>DEBUG;TRACE</DefineConstants>
2225
<ErrorReport>prompt</ErrorReport>
2326
<WarningLevel>4</WarningLevel>
27+
<Prefer32Bit>false</Prefer32Bit>
2428
</PropertyGroup>
2529
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2630
<DebugType>pdbonly</DebugType>
@@ -29,6 +33,7 @@
2933
<DefineConstants>TRACE</DefineConstants>
3034
<ErrorReport>prompt</ErrorReport>
3135
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
3237
</PropertyGroup>
3338
<ItemGroup>
3439
<Reference Include="Interop.NetFwTypeLib">
@@ -48,6 +53,13 @@
4853
<Reference Include="System.Net.Http">
4954
<HintPath>..\..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
5055
</Reference>
56+
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
57+
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
58+
</Reference>
59+
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
60+
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
61+
</Reference>
62+
<Reference Include="System.Net.Http.WebRequest" />
5163
<Reference Include="System.Windows.Forms" />
5264
<Reference Include="System.Xaml" />
5365
<Reference Include="WindowsBase" />
@@ -153,7 +165,6 @@
153165
<Compile Include="Vms\KernelOutputSelectViewModel.cs" />
154166
<Compile Include="Vms\KernelInputSelectViewModel.cs" />
155167
<Compile Include="Vms\MinerProfileViewModel.cs" />
156-
<Compile Include="Vms\SignUpPageViewModel.cs" />
157168
<Compile Include="Vms\SpeedTableViewModel.cs" />
158169
<Compile Include="Vms\StartStopMineButtonViewModel.cs" />
159170
<Compile Include="Vms\SysDicItemSelectViewModel.cs" />
@@ -267,10 +278,17 @@
267278
</ProjectReference>
268279
</ItemGroup>
269280
<ItemGroup>
270-
<None Include="app.config" />
271281
<Compile Include="MinerStudio\MinerStudioRoot.partials.MinerClientMessagesViewModel.cs" />
272282
<Compile Include="MinerStudio\MinerStudioRoot.partials.MinerClientOperationResultsViewModel.cs" />
283+
<None Include="app.config" />
273284
<None Include="packages.config" />
274285
</ItemGroup>
275286
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
287+
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
288+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
289+
<PropertyGroup>
290+
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
291+
</PropertyGroup>
292+
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
293+
</Target>
276294
</Project>

‎src/AppModels/Messages.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,6 @@
66
using System.Windows;
77

88
namespace NTMiner {
9-
[MessageType(description: "升级")]
10-
public class UpgradeCommand : Cmd {
11-
public UpgradeCommand(string fileName, Action callback) {
12-
this.FileName = fileName;
13-
this.Callback = callback;
14-
}
15-
16-
public string FileName { get; private set; }
17-
public Action Callback { get; private set; }
18-
}
19-
209
[MessageType(description: "启用windows远程桌面")]
2110
public class EnableRemoteDesktopCommand : Cmd {
2211
public EnableRemoteDesktopCommand() {
@@ -350,11 +339,6 @@ public ShowKernelOutputKeywordsCommand() {
350339
}
351340
}
352341

353-
[MessageType(description: "打开用户注册页")]
354-
public class ShowSignUpPageCommand : Cmd {
355-
public ShowSignUpPageCommand() { }
356-
}
357-
358342
[MessageType(description: "打开钱包地址编辑界面")]
359343
public class EditWalletCommand : EditCommand<WalletViewModel> {
360344
public EditWalletCommand(FormType formType, WalletViewModel source) : base(formType, source) {

‎src/AppModels/Vms/StateBarViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public string RemoteDesktopToolTip {
7979
if (IsRemoteDesktopEnabled) {
8080
return "Windows远程桌面已启用";
8181
}
82-
return "Windows远程桌面已禁用";
82+
return "未启用Windows远程桌面";
8383
}
8484
}
8585

‎src/AppModels/packages.config‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LiveCharts" version="0.9.7" targetFramework="net40" />
4-
<package id="LiveCharts.Wpf" version="0.9.7" targetFramework="net40" />
3+
<package id="LiveCharts" version="0.9.7" targetFramework="net40" requireReinstallation="true" />
4+
<package id="LiveCharts.Wpf" version="0.9.7" targetFramework="net40" requireReinstallation="true" />
5+
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
6+
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
7+
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
58
</packages>

‎src/AppViews0/AppViewFactory.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,6 @@ public override void BuildPaths() {
224224
KernelOutputKeywords.ShowWindow();
225225
});
226226
}, location: location);
227-
VirtualRoot.BuildCmdPath<ShowSignUpPageCommand>(path: message => {
228-
UIThread.Execute(() => {
229-
SignUpPage.ShowWindow();
230-
});
231-
}, location: location);
232227
VirtualRoot.BuildCmdPath<EditWalletCommand>(path: message => {
233228
UIThread.Execute(() => {
234229
WalletEdit.ShowWindow(message.FormType, message.Source);

‎src/AppViews0/AppViews0.csproj‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>NTMiner</RootNamespace>
1212
<AssemblyName>AppViews0</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>
1616
<FileAlignment>512</FileAlignment>
@@ -83,6 +83,14 @@
8383
<HintPath>..\..\packages\LiveCharts.Wpf.0.9.7\lib\net40\LiveCharts.Wpf.dll</HintPath>
8484
</Reference>
8585
<Reference Include="System" />
86+
<Reference Include="System.Net.Http" />
87+
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88+
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
89+
</Reference>
90+
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91+
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
92+
</Reference>
93+
<Reference Include="System.Net.Http.WebRequest" />
8694
<Reference Include="System.Windows.Forms" />
8795
<Reference Include="System.Xaml">
8896
<RequiredTargetFramework>4.0</RequiredTargetFramework>
@@ -145,9 +153,6 @@
145153
<Compile Include="Views\Ucs\WindowsAutoLogon.xaml.cs">
146154
<DependentUpon>WindowsAutoLogon.xaml</DependentUpon>
147155
</Compile>
148-
<Compile Include="Views\Ucs\SignUpPage.xaml.cs">
149-
<DependentUpon>SignUpPage.xaml</DependentUpon>
150-
</Compile>
151156
<Compile Include="MinerStudio\Views\Ucs\MinerClients.xaml.cs">
152157
<DependentUpon>MinerClients.xaml</DependentUpon>
153158
</Compile>
@@ -536,10 +541,6 @@
536541
<Generator>MSBuild:Compile</Generator>
537542
<SubType>Designer</SubType>
538543
</Page>
539-
<Page Include="Views\Design\SignUpPageViewModel.xaml">
540-
<Generator>MSBuild:Compile</Generator>
541-
<SubType>Designer</SubType>
542-
</Page>
543544
<Page Include="Views\Design\RestartWindowsViewModel.xaml">
544545
<Generator>MSBuild:Compile</Generator>
545546
<SubType>Designer</SubType>
@@ -732,10 +733,6 @@
732733
<Generator>MSBuild:Compile</Generator>
733734
<SubType>Designer</SubType>
734735
</Page>
735-
<Page Include="Views\Ucs\SignUpPage.xaml">
736-
<Generator>MSBuild:Compile</Generator>
737-
<SubType>Designer</SubType>
738-
</Page>
739736
<Page Include="MinerStudio\Views\Ucs\MinerClients.xaml">
740737
<Generator>MSBuild:Compile</Generator>
741738
<SubType>Designer</SubType>
@@ -1209,6 +1206,13 @@
12091206
<PostBuildEvent>
12101207
</PostBuildEvent>
12111208
</PropertyGroup>
1209+
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
1210+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
1211+
<PropertyGroup>
1212+
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
1213+
</PropertyGroup>
1214+
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
1215+
</Target>
12121216
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
12131217
Other similar extension points exist, see Microsoft.Common.targets.
12141218
<Target Name="BeforeBuild">

‎src/AppViews0/MinerStudio/Views/Ucs/WsServerNodePage.xaml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<TextBlock Style="{StaticResource TextBlock}" Text="{Binding WebApiServerStateVm.Address}"></TextBlock>
3535
<TextBlock Style="{StaticResource LblTb}">进程内存</TextBlock>
3636
<TextBlock Style="{StaticResource TextBlock}" Text="{Binding WebApiServerStateVm.ProcessMemoryMbText}"></TextBlock>
37-
<TextBlock Style="{StaticResource LblTb}">线程数</TextBlock>
37+
<TextBlock Style="{StaticResource LblTb}">进程线程数</TextBlock>
3838
<TextBlock Style="{StaticResource TextBlock}" Text="{Binding WebApiServerStateVm.ThreadCount}"></TextBlock>
39-
<TextBlock Style="{StaticResource LblTb}">句柄数</TextBlock>
39+
<TextBlock Style="{StaticResource LblTb}">进程句柄数</TextBlock>
4040
<TextBlock Style="{StaticResource TextBlock}" Text="{Binding WebApiServerStateVm.HandleCount}"></TextBlock>
4141
<TextBlock Style="{StaticResource LblTb}">总内存</TextBlock>
4242
<TextBlock Style="{StaticResource TextBlock}" Text="{Binding WebApiServerStateVm.TotalPhysicalMemory,Converter={StaticResource ByteToGbConverter}}"></TextBlock>
@@ -105,15 +105,27 @@
105105
</DataGridTextColumn>
106106
<DataGridTextColumn IsReadOnly="True" Width="70" Header="进程内存" Binding="{Binding ProcessMemoryMbText}">
107107
</DataGridTextColumn>
108-
<DataGridTextColumn IsReadOnly="True" Width="50" Header="线程数" Binding="{Binding ThreadCount}">
108+
<DataGridTextColumn IsReadOnly="True" Width="50" Binding="{Binding ThreadCount}">
109+
<DataGridTextColumn.Header>
110+
<TextBlock TextWrapping="Wrap">进程线程数</TextBlock>
111+
</DataGridTextColumn.Header>
109112
</DataGridTextColumn>
110-
<DataGridTextColumn IsReadOnly="True" Width="50" Header="句柄数" Binding="{Binding HandleCount}">
113+
<DataGridTextColumn IsReadOnly="True" Width="50" Binding="{Binding HandleCount}">
114+
<DataGridTextColumn.Header>
115+
<TextBlock TextWrapping="Wrap">进程句柄数</TextBlock>
116+
</DataGridTextColumn.Header>
111117
</DataGridTextColumn>
112-
<DataGridTextColumn IsReadOnly="True" Width="60" Header="总内存" Binding="{Binding TotalPhysicalMemory,Converter={StaticResource ByteToGbConverter}}">
118+
<DataGridTextColumn IsReadOnly="True" Width="60" Header="机器内存" Binding="{Binding TotalPhysicalMemory,Converter={StaticResource ByteToGbConverter}}">
113119
</DataGridTextColumn>
114-
<DataGridTextColumn IsReadOnly="True" Width="60" Header="剩余内存" Binding="{Binding AvailablePhysicalMemory,Converter={StaticResource ByteToGbConverter}}">
120+
<DataGridTextColumn IsReadOnly="True" Width="60" Binding="{Binding AvailablePhysicalMemory,Converter={StaticResource ByteToGbConverter}}">
121+
<DataGridTextColumn.Header>
122+
<TextBlock TextWrapping="Wrap">剩余机器内存</TextBlock>
123+
</DataGridTextColumn.Header>
115124
</DataGridTextColumn>
116-
<DataGridTextColumn IsReadOnly="True" Width="70" Header="CPU使用率" Binding="{Binding CpuPerformanceText}">
125+
<DataGridTextColumn IsReadOnly="True" Width="70" Binding="{Binding CpuPerformanceText}">
126+
<DataGridTextColumn.Header>
127+
<TextBlock TextWrapping="Wrap">机器CPU使用率</TextBlock>
128+
</DataGridTextColumn.Header>
117129
</DataGridTextColumn>
118130
<DataGridTextColumn IsReadOnly="True" Width="306" Header="CPU名称" Binding="{Binding CpuVm.Name}">
119131
</DataGridTextColumn>

‎src/AppViews0/Properties/Resources.Designer.cs‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AppViews0/Properties/Settings.Designer.cs‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)