Skip to content

Commit a09640f

Browse files
author
panwenbo
committed
修复自动编译启动异常
1 parent c9de3f9 commit a09640f

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

One.Control/One.Control.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,19 @@
2121

2222
<ItemGroup>
2323
<Compile Remove="Controls\SerialPortPack\**" />
24+
<Compile Remove="Resources\**" />
2425
<EmbeddedResource Remove="Controls\SerialPortPack\**" />
26+
<EmbeddedResource Remove="Resources\**" />
2527
<None Remove="Controls\SerialPortPack\**" />
28+
<None Remove="Resources\**" />
2629
<Page Remove="Controls\SerialPortPack\**" />
30+
<Page Remove="Resources\**" />
2731
</ItemGroup>
2832
<ItemGroup>
2933
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
3034
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
3135
</ItemGroup>
3236
<ItemGroup>
3337
<Folder Include="Controls\MonthView\" />
34-
<Folder Include="Resources\" />
3538
</ItemGroup>
3639
</Project>

One.Toolbox/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public static void SendReport(Exception exception, string developerMessage = "",
128128
{
129129
//return;
130130
}
131-
Tools.MessageBox.Show($"internal error from system!\r\n{exception.Message}\r\nexit!");
131+
Tools.MessageBox.Show($"internal error from system!\r\n{exception.ToString()}\r\nexit!");
132132
}
133133

134134
#endregion Exception

One.Toolbox/One.Toolbox.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</ItemGroup>
2323
<ItemGroup>
2424
<Content Include="Icon.ico" />
25-
<Content Include="Resources\Icon.png">
25+
<Resource Include="Resources\Icon.png">
2626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
</Content>
27+
</Resource>
2828
</ItemGroup>
2929
<ItemGroup>
3030
<Resource Include="Resources\Img\Flag\cn.png" />

0 commit comments

Comments
 (0)