Skip to content

Commit b54aa36

Browse files
committed
fix tests
1 parent ca70e89 commit b54aa36

4 files changed

Lines changed: 11 additions & 5 deletions

File tree

Datamodel.NET.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<PackageLicenseFile>COPYING</PackageLicenseFile>
99
<PackageReadmeFile>README.md</PackageReadmeFile>
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11-
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
1211
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1312
<IncludeSymbols>true</IncludeSymbols>
1413
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
15-
<NoWarn>IDE0018</NoWarn>
14+
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
15+
<NoWarn>IDE0018</NoWarn>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
1818
<SignAssembly>True</SignAssembly>

Datamodel.NET.sln

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Global
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1818
{075743A9-B292-410C-B68F-6E6CF588D60A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1919
{075743A9-B292-410C-B68F-6E6CF588D60A}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{075743A9-B292-410C-B68F-6E6CF588D60A}.Documentation|Any CPU.ActiveCfg = Release|Any CPU
21+
{075743A9-B292-410C-B68F-6E6CF588D60A}.Documentation|Any CPU.Build.0 = Release|Any CPU
2022
{075743A9-B292-410C-B68F-6E6CF588D60A}.Release|Any CPU.ActiveCfg = Release|Any CPU
2123
{075743A9-B292-410C-B68F-6E6CF588D60A}.Release|Any CPU.Build.0 = Release|Any CPU
2224
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

Tests/Tests.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Numerics;
1010
using DM = Datamodel.Datamodel;
1111
using System.Text;
12+
using System.Globalization;
1213

1314
namespace Datamodel_Tests
1415
{
@@ -19,14 +20,18 @@ public class DatamodelTests
1920
protected FileStream Binary_4_File = File.OpenRead(TestContext.CurrentContext.TestDirectory + "/Resources/binary4.dmx");
2021
protected FileStream KeyValues2_1_File = File.OpenRead(TestContext.CurrentContext.TestDirectory + "/Resources/taunt05.dmx");
2122

22-
const string GameBin = @"C:/Program Files (x86)/Steam/steamapps/common/Counter-Strike Global Offensive/game/bin/win64";
23-
//const string GameBin = @"D:/Games/steamapps/common/Counter-Strike Global Offensive/game/bin/win64";
23+
// TODO: would be nice if this could find this path automatically
24+
//const string GameBin = @"C:/Program Files (x86)/Steam/steamapps/common/Counter-Strike Global Offensive/game/bin/win64";
25+
const string GameBin = @"D:/Steam/steamapps/common/Counter-Strike Global Offensive/game/bin/win64";
2426

2527
static readonly string DmxConvertExe = Path.Combine(GameBin, "dmxconvert.exe");
2628
static readonly bool DmxConvertExe_Exists = File.Exists(DmxConvertExe);
2729

2830
static DatamodelTests()
2931
{
32+
CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
33+
CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
34+
3035
var binary = new byte[16];
3136
Random.Shared.NextBytes(binary);
3237
var quat = Quaternion.Normalize(new Quaternion(1, 2, 3, 4)); // dmxconvert will normalise this if I don't!

Tests/Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<RootNamespace>Datamodel_Tests</RootNamespace>
66
<AssemblyName>Datamodel.NET-Tests</AssemblyName>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8-
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
98
</PropertyGroup>
109
<ItemGroup>
1110
<None Include="Resources\**">

0 commit comments

Comments
 (0)