Skip to content

Commit

Permalink
Merge pull request #170 from microsoft/users/arunkm/update-reference-…
Browse files Browse the repository at this point in the history 
…to-newer-json-package

Update Newtonsoft.Json package references in test programs
  • Loading branch information
@arunkm
arunkm authored Nov 23, 2022
2 parents faf85de + dc13476 commit eda180e
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 50 deletions.
84 changes: 42 additions & 42 deletions Sources/Core/Microsoft.StreamProcessing/Serializer/Serializers/ReflectionSchemaBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,48 +23,48 @@ internal sealed class ReflectionSchemaBuilder

static ReflectionSchemaBuilder()
{
RuntimeTypeToSerializer[typeof(char)] = () => PrimitiveSerializer.Char;
RuntimeTypeToSerializer[typeof(byte)] = () => PrimitiveSerializer.Byte;
RuntimeTypeToSerializer[typeof(sbyte)] = () => PrimitiveSerializer.SByte;
RuntimeTypeToSerializer[typeof(short)] = () => PrimitiveSerializer.Short;
RuntimeTypeToSerializer[typeof(ushort)] = () => PrimitiveSerializer.UShort;
RuntimeTypeToSerializer[typeof(int)] = () => PrimitiveSerializer.Int;
RuntimeTypeToSerializer[typeof(uint)] = () => PrimitiveSerializer.UInt;
RuntimeTypeToSerializer[typeof(bool)] = () => PrimitiveSerializer.Boolean;
RuntimeTypeToSerializer[typeof(long)] = () => PrimitiveSerializer.Long;
RuntimeTypeToSerializer[typeof(ulong)] = () => PrimitiveSerializer.ULong;
RuntimeTypeToSerializer[typeof(float)] = () => PrimitiveSerializer.Float;
RuntimeTypeToSerializer[typeof(double)] = () => PrimitiveSerializer.Double;
RuntimeTypeToSerializer[typeof(decimal)] = () => PrimitiveSerializer.Decimal;
RuntimeTypeToSerializer[typeof(string)] = () => PrimitiveSerializer.String;
RuntimeTypeToSerializer[typeof(Uri)] = () => PrimitiveSerializer.Uri;
RuntimeTypeToSerializer[typeof(TimeSpan)] = () => PrimitiveSerializer.TimeSpan;
RuntimeTypeToSerializer[typeof(DateTime)] = () => PrimitiveSerializer.DateTime;
RuntimeTypeToSerializer[typeof(DateTimeOffset)] = () => PrimitiveSerializer.DateTimeOffset;
RuntimeTypeToSerializer[typeof(Guid)] = () => PrimitiveSerializer.Guid;

RuntimeTypeToSerializer[typeof(char[])] = () => PrimitiveSerializer.CreateForArray<char>();
RuntimeTypeToSerializer[typeof(byte[])] = () => PrimitiveSerializer.ByteArray;
RuntimeTypeToSerializer[typeof(short[])] = () => PrimitiveSerializer.CreateForArray<short>();
RuntimeTypeToSerializer[typeof(ushort[])] = () => PrimitiveSerializer.CreateForArray<ushort>();
RuntimeTypeToSerializer[typeof(int[])] = () => PrimitiveSerializer.CreateForArray<int>();
RuntimeTypeToSerializer[typeof(uint[])] = () => PrimitiveSerializer.CreateForArray<uint>();
RuntimeTypeToSerializer[typeof(long[])] = () => PrimitiveSerializer.CreateForArray<long>();
RuntimeTypeToSerializer[typeof(ulong[])] = () => PrimitiveSerializer.CreateForArray<ulong>();
RuntimeTypeToSerializer[typeof(float[])] = () => PrimitiveSerializer.CreateForArray<float>();
RuntimeTypeToSerializer[typeof(double[])] = () => PrimitiveSerializer.CreateForArray<double>();
RuntimeTypeToSerializer[typeof(string[])] = () => PrimitiveSerializer.StringArray;

RuntimeTypeToSerializer[typeof(ColumnBatch<char>)] = () => PrimitiveSerializer.CreateForColumnBatch<char>();
RuntimeTypeToSerializer[typeof(ColumnBatch<short>)] = () => PrimitiveSerializer.CreateForColumnBatch<short>();
RuntimeTypeToSerializer[typeof(ColumnBatch<ushort>)] = () => PrimitiveSerializer.CreateForColumnBatch<ushort>();
RuntimeTypeToSerializer[typeof(ColumnBatch<int>)] = () => PrimitiveSerializer.CreateForColumnBatch<int>();
RuntimeTypeToSerializer[typeof(ColumnBatch<uint>)] = () => PrimitiveSerializer.CreateForColumnBatch<uint>();
RuntimeTypeToSerializer[typeof(ColumnBatch<long>)] = () => PrimitiveSerializer.CreateForColumnBatch<long>();
RuntimeTypeToSerializer[typeof(ColumnBatch<ulong>)] = () => PrimitiveSerializer.CreateForColumnBatch<ulong>();
RuntimeTypeToSerializer[typeof(ColumnBatch<float>)] = () => PrimitiveSerializer.CreateForColumnBatch<float>();
RuntimeTypeToSerializer[typeof(ColumnBatch<double>)] = () => PrimitiveSerializer.CreateForColumnBatch<double>();
RuntimeTypeToSerializer[typeof(ColumnBatch<string>)] = () => PrimitiveSerializer.StringColumnBatch;
RuntimeTypeToSerializer[typeof(char)] = () => PrimitiveSerializer.Char;
RuntimeTypeToSerializer[typeof(byte)] = () => PrimitiveSerializer.Byte;
RuntimeTypeToSerializer[typeof(sbyte)] = () => PrimitiveSerializer.SByte;
RuntimeTypeToSerializer[typeof(short)] = () => PrimitiveSerializer.Short;
RuntimeTypeToSerializer[typeof(ushort)] = () => PrimitiveSerializer.UShort;
RuntimeTypeToSerializer[typeof(int)] = () => PrimitiveSerializer.Int;
RuntimeTypeToSerializer[typeof(uint)] = () => PrimitiveSerializer.UInt;
RuntimeTypeToSerializer[typeof(bool)] = () => PrimitiveSerializer.Boolean;
RuntimeTypeToSerializer[typeof(long)] = () => PrimitiveSerializer.Long;
RuntimeTypeToSerializer[typeof(ulong)] = () => PrimitiveSerializer.ULong;
RuntimeTypeToSerializer[typeof(float)] = () => PrimitiveSerializer.Float;
RuntimeTypeToSerializer[typeof(double)] = () => PrimitiveSerializer.Double;
RuntimeTypeToSerializer[typeof(decimal)] = () => PrimitiveSerializer.Decimal;
RuntimeTypeToSerializer[typeof(string)] = () => PrimitiveSerializer.String;
RuntimeTypeToSerializer[typeof(Uri)] = () => PrimitiveSerializer.Uri;
RuntimeTypeToSerializer[typeof(TimeSpan)] = () => PrimitiveSerializer.TimeSpan;
RuntimeTypeToSerializer[typeof(DateTime)] = () => PrimitiveSerializer.DateTime;
RuntimeTypeToSerializer[typeof(DateTimeOffset)] = () => PrimitiveSerializer.DateTimeOffset;
RuntimeTypeToSerializer[typeof(Guid)] = () => PrimitiveSerializer.Guid;

RuntimeTypeToSerializer[typeof(char[])] = () => PrimitiveSerializer.CreateForArray<char>();
RuntimeTypeToSerializer[typeof(byte[])] = () => PrimitiveSerializer.ByteArray;
RuntimeTypeToSerializer[typeof(short[])] = () => PrimitiveSerializer.CreateForArray<short>();
RuntimeTypeToSerializer[typeof(ushort[])] = () => PrimitiveSerializer.CreateForArray<ushort>();
RuntimeTypeToSerializer[typeof(int[])] = () => PrimitiveSerializer.CreateForArray<int>();
RuntimeTypeToSerializer[typeof(uint[])] = () => PrimitiveSerializer.CreateForArray<uint>();
RuntimeTypeToSerializer[typeof(long[])] = () => PrimitiveSerializer.CreateForArray<long>();
RuntimeTypeToSerializer[typeof(ulong[])] = () => PrimitiveSerializer.CreateForArray<ulong>();
RuntimeTypeToSerializer[typeof(float[])] = () => PrimitiveSerializer.CreateForArray<float>();
RuntimeTypeToSerializer[typeof(double[])] = () => PrimitiveSerializer.CreateForArray<double>();
RuntimeTypeToSerializer[typeof(string[])] = () => PrimitiveSerializer.StringArray;

RuntimeTypeToSerializer[typeof(ColumnBatch<char>)] = () => PrimitiveSerializer.CreateForColumnBatch<char>();
RuntimeTypeToSerializer[typeof(ColumnBatch<short>)] = () => PrimitiveSerializer.CreateForColumnBatch<short>();
RuntimeTypeToSerializer[typeof(ColumnBatch<ushort>)] = () => PrimitiveSerializer.CreateForColumnBatch<ushort>();
RuntimeTypeToSerializer[typeof(ColumnBatch<int>)] = () => PrimitiveSerializer.CreateForColumnBatch<int>();
RuntimeTypeToSerializer[typeof(ColumnBatch<uint>)] = () => PrimitiveSerializer.CreateForColumnBatch<uint>();
RuntimeTypeToSerializer[typeof(ColumnBatch<long>)] = () => PrimitiveSerializer.CreateForColumnBatch<long>();
RuntimeTypeToSerializer[typeof(ColumnBatch<ulong>)] = () => PrimitiveSerializer.CreateForColumnBatch<ulong>();
RuntimeTypeToSerializer[typeof(ColumnBatch<float>)] = () => PrimitiveSerializer.CreateForColumnBatch<float>();
RuntimeTypeToSerializer[typeof(ColumnBatch<double>)] = () => PrimitiveSerializer.CreateForColumnBatch<double>();
RuntimeTypeToSerializer[typeof(ColumnBatch<string>)] = () => PrimitiveSerializer.StringColumnBatch;

RuntimeTypeToSerializer[typeof(CharArrayWrapper)] = () => PrimitiveSerializer.CharArray;
}
Expand Down
13 changes: 7 additions & 6 deletions Sources/Test/SimpleTesting/SimpleTesting.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.3.2" />
<PackageReference Include="System.Reactive.Linq" Version="4.1.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -160,6 +161,6 @@
</Compile>
</ItemGroup>

<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\TextTemplating\Microsoft.TextTemplating.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(MSBuildAssemblyVersion)\TextTemplating\Microsoft.TextTemplating.targets" />

</Project>
5 changes: 3 additions & 2 deletions Sources/Test/TrillPerf/PerformanceTesting.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.3.2" />
<PackageReference Include="System.Reactive.Linq" Version="4.1.5" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

<PropertyGroup>
Expand Down

0 comments on commit eda180e

Please sign in to comment.