Skip to content

Commit ccccd2f

Browse files
riperipeririperiperi
committed
[VM, LotView] Fix a few bugs.
1 parent de61a31 commit ccccd2f

Some content is hidden

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

48 files changed

+179
-30
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,4 @@ UpgradeLog*.htm
8383
TSOClient/tso.client/GlobalSettings1.Designer.cs
8484
*.DS_Store
8585
TSOClient/.vs/config/applicationhost.config
86+
*.nvuser

‎Other/libs/TargaImage/TargaImage.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<DocumentationFile>bin\Release\TargaImage.xml</DocumentationFile>
4343
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4444
<Prefer32Bit>false</Prefer32Bit>
45+
<UseVSHostingProcess>true</UseVSHostingProcess>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
4748
<OutputPath>bin\ServerRelease\</OutputPath>

‎Other/libs/TargaImagePCL/TargaImagePCL.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<UseVSHostingProcess>true</UseVSHostingProcess>
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3839
<OutputPath>bin\ServerRelease\</OutputPath>

‎Other/libs/VoronoiLib/VoronoiLib.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<DefineConstants>TRACE</DefineConstants>
3030
<ErrorReport>prompt</ErrorReport>
3131
<WarningLevel>4</WarningLevel>
32+
<UseVSHostingProcess>true</UseVSHostingProcess>
3233
</PropertyGroup>
3334
<ItemGroup>
3435
<Reference Include="System" />

‎TSOClient/FSO.Common.DatabaseService/FSO.Common.DatabaseService.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33+
<UseVSHostingProcess>true</UseVSHostingProcess>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3536
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Common.Domain/FSO.Common.Domain.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33+
<UseVSHostingProcess>true</UseVSHostingProcess>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3536
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.IDE/FSO.IDE.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<ErrorReport>prompt</ErrorReport>
7575
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7676
<Prefer32Bit>false</Prefer32Bit>
77+
<UseVSHostingProcess>true</UseVSHostingProcess>
7778
</PropertyGroup>
7879
<PropertyGroup>
7980
<ApplicationIcon>IDE.ico</ApplicationIcon>

‎TSOClient/FSO.Patcher/FSO.Patcher.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<UseVSHostingProcess>true</UseVSHostingProcess>
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3839
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Server.Api/FSO.Server.Api.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<DefineConstants>TRACE</DefineConstants>
4545
<ErrorReport>prompt</ErrorReport>
4646
<WarningLevel>4</WarningLevel>
47+
<UseVSHostingProcess>true</UseVSHostingProcess>
4748
</PropertyGroup>
4849
<ItemGroup>
4950
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">

‎TSOClient/FSO.Server.Clients/FSO.Server.Clients.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33+
<UseVSHostingProcess>true</UseVSHostingProcess>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3536
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Server.Common/FSO.Server.Common.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33+
<UseVSHostingProcess>true</UseVSHostingProcess>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3536
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Server.DataService/FSO.Common.DataService.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33+
<UseVSHostingProcess>true</UseVSHostingProcess>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3536
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Server.Database/FSO.Server.Database.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33+
<UseVSHostingProcess>true</UseVSHostingProcess>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3536
<OutputPath>bin\ServerRelease\</OutputPath>
@@ -359,4 +360,4 @@
359360
<Target Name="AfterBuild">
360361
</Target>
361362
-->
362-
</Project>
363+
</Project>

‎TSOClient/FSO.Server.Debug/FSO.Server.Debug.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<UseVSHostingProcess>true</UseVSHostingProcess>
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3839
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Server.Domain/FSO.Server.Domain.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<DefineConstants>TRACE</DefineConstants>
3030
<ErrorReport>prompt</ErrorReport>
3131
<WarningLevel>4</WarningLevel>
32+
<UseVSHostingProcess>true</UseVSHostingProcess>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3435
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Server.Protocol/FSO.Server.Protocol.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33+
<UseVSHostingProcess>true</UseVSHostingProcess>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3536
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Server.Updater/FSO.Server.Watchdog.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<UseVSHostingProcess>true</UseVSHostingProcess>
3637
</PropertyGroup>
3738
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3839
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.Server/FSO.Server.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<DefineConstants>TRACE</DefineConstants>
4949
<ErrorReport>prompt</ErrorReport>
5050
<WarningLevel>4</WarningLevel>
51+
<UseVSHostingProcess>true</UseVSHostingProcess>
5152
</PropertyGroup>
5253
<PropertyGroup>
5354
<ApplicationIcon>FreeSO.ico</ApplicationIcon>

‎TSOClient/FSO.UI/FSO.UI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<DefineConstants>TRACE</DefineConstants>
3030
<ErrorReport>prompt</ErrorReport>
3131
<WarningLevel>4</WarningLevel>
32+
<UseVSHostingProcess>true</UseVSHostingProcess>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
3435
<OutputPath>bin\ServerRelease\</OutputPath>

‎TSOClient/FSO.UI/Framework/TextRenderer.cs

+1
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ public static void CalculateLines(List<UITextEditLine> m_Lines, List<string> new
330330
currentLineNum++;
331331
currentLine = new StringBuilder();
332332
currentLineWidth = 0;
333+
if (word.Length == 0) wordWritten = true;
333334
}
334335
else if (currentLineWidth + wordSize.X < allowedWidth)
335336
{

‎TSOClient/FSO.Windows/FSO.Windows.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<DefineConstants>TRACE</DefineConstants>
4848
<ErrorReport>prompt</ErrorReport>
4949
<WarningLevel>4</WarningLevel>
50+
<UseVSHostingProcess>true</UseVSHostingProcess>
5051
</PropertyGroup>
5152
<PropertyGroup>
5253
<ApplicationIcon>fso.ico</ApplicationIcon>

‎TSOClient/FSODroid/FSODroid.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<DebugSymbols>False</DebugSymbols>
6666
<AndroidSupportedAbis>armeabi-v7a,x86,arm64-v8a</AndroidSupportedAbis>
6767
<AndroidLinkSkip>MonoGame.Framework;FSO.Files;FSO.SimAntics;FSO.Content;Ninject;FSO.Client;FSO.Server.Protocol;FSO.Common.Domain;FSO.Common.DatabaseService;FSO.Common.DataService;FSO.UI;System.Collections.Immutable;</AndroidLinkSkip>
68+
<UseVSHostingProcess>true</UseVSHostingProcess>
6869
</PropertyGroup>
6970
<ItemGroup>
7071
<Reference Include="Common.Logging, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">

‎TSOClient/FSOFacadeWorker/App.config

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
55
</startup>
66
<runtime>
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -17,6 +17,10 @@
1717
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
1818
<bindingRedirect oldVersion="0.0.0.0-3.4.1.0" newVersion="3.4.1.0" />
1919
</dependentAssembly>
20+
<dependentAssembly>
21+
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
23+
</dependentAssembly>
2024
</assemblyBinding>
2125
</runtime>
22-
</configuration>
26+
</configuration>

‎TSOClient/FSOFacadeWorker/FSOFacadeWorker.csproj

+31-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.Net.Compilers.Toolset.3.1.0\build\Microsoft.Net.Compilers.Toolset.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.Toolset.3.1.0\build\Microsoft.Net.Compilers.Toolset.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +10,12 @@
910
<AppDesignerFolder>Properties</AppDesignerFolder>
1011
<RootNamespace>FSOFacadeWorker</RootNamespace>
1112
<AssemblyName>FSOFacadeWorker</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16+
<TargetFrameworkProfile />
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
1519
</PropertyGroup>
1620
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1721
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -51,13 +55,33 @@
5155
<ErrorReport>prompt</ErrorReport>
5256
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5357
<Prefer32Bit>true</Prefer32Bit>
58+
<UseVSHostingProcess>true</UseVSHostingProcess>
5459
</PropertyGroup>
5560
<ItemGroup>
5661
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5762
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5863
</Reference>
64+
<Reference Include="SixLabors.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\packages\SixLabors.Core.1.0.0-beta0008\lib\netstandard2.0\SixLabors.Core.dll</HintPath>
66+
</Reference>
67+
<Reference Include="SixLabors.ImageSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\packages\SixLabors.ImageSharp.1.0.0-beta0007\lib\netstandard2.0\SixLabors.ImageSharp.dll</HintPath>
69+
</Reference>
5970
<Reference Include="System" />
71+
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
72+
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
73+
</Reference>
6074
<Reference Include="System.Core" />
75+
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
76+
<HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
77+
</Reference>
78+
<Reference Include="System.Numerics" />
79+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
80+
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
81+
</Reference>
82+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
83+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
84+
</Reference>
6185
<Reference Include="System.Windows.Forms" />
6286
<Reference Include="System.Xml.Linq" />
6387
<Reference Include="System.Data.DataSetExtensions" />
@@ -132,6 +156,12 @@
132156
</ProjectReference>
133157
</ItemGroup>
134158
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
159+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
160+
<PropertyGroup>
161+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
162+
</PropertyGroup>
163+
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.Toolset.3.1.0\build\Microsoft.Net.Compilers.Toolset.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.Toolset.3.1.0\build\Microsoft.Net.Compilers.Toolset.props'))" />
164+
</Target>
135165
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
136166
Other similar extension points exist, see Microsoft.Common.targets.
137167
<Target Name="BeforeBuild">

‎TSOClient/FSOFacadeWorker/GraphicsDeviceServiceMock.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.Xna.Framework.Graphics;
1+
using Microsoft.Xna.Framework;
2+
using Microsoft.Xna.Framework.Graphics;
23
using System;
34
using System.Collections.Generic;
45
using System.Linq;
@@ -17,7 +18,7 @@ public GraphicsDeviceServiceMock()
1718
{
1819
HiddenForm = new Form()
1920
{
20-
Visible = false,
21+
Visible = true,
2122
ShowInTaskbar = false
2223
};
2324

@@ -31,6 +32,7 @@ public GraphicsDeviceServiceMock()
3132
};
3233

3334
_GraphicsDevice = new GraphicsDevice(GraphicsAdapter.DefaultAdapter, GraphicsProfile.Reach, Parameters);
35+
_GraphicsDevice.Present();
3436
}
3537

3638
public GraphicsDevice GraphicsDevice

0 commit comments

Comments
 (0)