Skip to content

Upgrade to .NET standard #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to .NET standard #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions MongoDB.Integrations.JsonDotNet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.28922.388
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Integrations.JsonDotNet", "src\MongoDB.Integrations.JsonDotNet\MongoDB.Integrations.JsonDotNet.csproj", "{BD207CF4-7494-4873-9D08-0FCE1A6A3B3E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Integrations.JsonDotNet", "src\MongoDB.Integrations.JsonDotNet\MongoDB.Integrations.JsonDotNet.csproj", "{BD207CF4-7494-4873-9D08-0FCE1A6A3B3E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Integrations.JsonDotNet.Tests", "tests\MongoDB.Integrations.JsonDotNet.Tests\MongoDB.Integrations.JsonDotNet.Tests.csproj", "{FC8172BA-9BF4-411A-8149-7887321A13BC}"
EndProject
Expand Down Expand Up @@ -33,4 +33,7 @@ Global
{BD207CF4-7494-4873-9D08-0FCE1A6A3B3E} = {C5830C65-B9F3-4BD4-BDC9-E8F617E9FD2F}
{FC8172BA-9BF4-411A-8149-7887321A13BC} = {857B0FAE-568A-4BAC-AE77-0704F282DB97}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {481EB202-C5D2-4A7F-9992-8386EE2730A7}
EndGlobalSection
EndGlobal
2 changes: 2 additions & 0 deletions src/MongoDB.Integrations.JsonDotNet/JsonSerializerAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
using System.Reflection;
using System.Linq;
using System.Collections.Generic;
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("MongoDB.Integrations.JsonDotNet.Tests")]
namespace MongoDB.Integrations.JsonDotNet
{
internal static class JsonSerializerAdapterHelper
Expand Down
101 changes: 13 additions & 88 deletions src/MongoDB.Integrations.JsonDotNet/MongoDB.Integrations.JsonDotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,96 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{BD207CF4-7494-4873-9D08-0FCE1A6A3B3E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MongoDB.Integrations.JsonDotNet</RootNamespace>
<AssemblyName>MongoDB.Integrations.JsonDotNet</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DocumentationFile>bin\Debug\MongoDB.Integrations.JsonDotNet.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\MongoDB.Integrations.JsonDotNet.XML</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup>
<Reference Include="MongoDB.Bson, Version=2.2.3.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MongoDB.Bson.2.2.3\lib\net45\MongoDB.Bson.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Converters\BsonArrayConverter.cs" />
<Compile Include="Converters\BsonBinaryDataConverter.cs" />
<Compile Include="Converters\BsonBooleanConverter.cs" />
<Compile Include="Converters\BsonDateTimeConverter.cs" />
<Compile Include="Converters\BsonDocumentConverter.cs" />
<Compile Include="Converters\BsonDoubleConverter.cs" />
<Compile Include="Converters\BsonInt64Converter.cs" />
<Compile Include="Converters\BsonJavaScriptConverter.cs" />
<Compile Include="Converters\BsonJavaScriptWithScopeConverter.cs" />
<Compile Include="Converters\BsonMinKeyConverter.cs" />
<Compile Include="Converters\BsonNullConverter.cs" />
<Compile Include="Converters\BsonObjectIdConverter.cs" />
<Compile Include="Converters\BsonRegularExpressionConverter.cs" />
<Compile Include="Converters\BsonStringConverter.cs" />
<Compile Include="Converters\BsonSymbolConverter.cs" />
<Compile Include="Converters\BsonTimestampConverter.cs" />
<Compile Include="Converters\BsonUndefinedConverter.cs" />
<Compile Include="Converters\BsonValueConverter.cs" />
<Compile Include="Converters\BsonInt32Converter.cs" />
<Compile Include="Converters\BsonMaxKeyConverter.cs" />
<Compile Include="Converters\JsonConverterBase.cs" />
<Compile Include="Converters\ObjectIdConverter.cs" />
<Compile Include="JsonDotNetSerializationProvider.cs" />
<Compile Include="JsonSerializerAdapter.cs" />
<Compile Include="BsonReaderAdapter.cs" />
<Compile Include="JsonReaderBase.cs" />
<Compile Include="JsonTokenExtensions.cs" />
<Compile Include="BsonWriterAdapter.cs" />
<Compile Include="MongoContainerType.cs" />
<Compile Include="MongoPosition.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.8.0" />
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
</ItemGroup>

<ItemGroup>
<None Include="packages.config" />
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
54 changes: 0 additions & 54 deletions src/MongoDB.Integrations.JsonDotNet/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/MongoDB.Integrations.JsonDotNet/packages.config
View file
Open in desktop

This file was deleted.

142 changes: 142 additions & 0 deletions tests/MongoDB.Integrations.JsonDotNet.Tests/MongoDB.Integrations.JsonDotNet.Tests-.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FC8172BA-9BF4-411A-8149-7887321A13BC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MongoDB.Integrations.JsonDotNet.Tests</RootNamespace>
<AssemblyName>MongoDB.Integrations.JsonDotNet.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentAssertions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<HintPath>..\..\packages\FluentAssertions.4.5.0\lib\net45\FluentAssertions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FluentAssertions.Core, Version=4.5.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<HintPath>..\..\packages\FluentAssertions.4.5.0\lib\net45\FluentAssertions.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MongoDB.Bson, Version=2.2.3.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MongoDB.Bson.2.2.3\lib\net45\MongoDB.Bson.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.0.10\lib\Mono.Cecil.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
<HintPath>..\..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.engine, Version=3.0.5813.39036, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.0.10\lib\nunit.engine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.0.10\lib\nunit.engine.api.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NUnit3.TestAdapter, Version=3.0.10.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit3TestAdapter.3.0.10\lib\NUnit3.TestAdapter.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Converters\BsonArrayConverterTests.cs" />
<Compile Include="Converters\BsonBinaryDataConverterTests.cs" />
<Compile Include="Converters\BsonBooleanConverterTests.cs" />
<Compile Include="Converters\BsonDateTimeConverterTests.cs" />
<Compile Include="Converters\BsonDocumentConverterTests.cs" />
<Compile Include="Converters\BsonDoubleConverterTests.cs" />
<Compile Include="Converters\BsonInt32ConverterTests.cs" />
<Compile Include="Converters\BsonInt64ConverterTests.cs" />
<Compile Include="Converters\BsonJavaScriptConverterTests.cs" />
<Compile Include="Converters\BsonJavaScriptWithScopeConverterTests.cs" />
<Compile Include="Converters\BsonMaxKeyConverterTests.cs" />
<Compile Include="Converters\BsonMinKeyConverterTests.cs" />
<Compile Include="Converters\BsonNullConverterTests.cs" />
<Compile Include="Converters\BsonObjectIdConverterTests.cs" />
<Compile Include="Converters\BsonRegularExpressionConverterTests.cs" />
<Compile Include="Converters\BsonStringConverterTests.cs" />
<Compile Include="Converters\BsonSymbolConverterTests.cs" />
<Compile Include="Converters\BsonTimestampConverterTests.cs" />
<Compile Include="Converters\BsonUndefinedConverterTests.cs" />
<Compile Include="Converters\BsonValueConverterTests.cs" />
<Compile Include="Converters\JsonConverterTestsBase.cs" />
<Compile Include="Converters\ObjectIdConverterTests.cs" />
<Compile Include="Helpers\FluentAssertions\BsonArrayAssertions.cs" />
<Compile Include="Helpers\FluentAssertions\BsonAssertionExtensions.cs" />
<Compile Include="Helpers\FluentAssertions\BsonDocumentAssertions.cs" />
<Compile Include="Helpers\FluentAssertions\BsonValueAssertions.cs" />
<Compile Include="JsonDotNetSerializationProviderTests.cs" />
<Compile Include="JsonSerializerAdapterTests.cs" />
<Compile Include="JsonSerializerAdapter\JsonSerializerAdapterTests.cs" />
<Compile Include="JsonSerializerAdapter\JsonSerializerAdapterTestsBase.cs" />
<Compile Include="BsonReaderAdapterTests.cs" />
<Compile Include="JsonReaderBaseTests.cs" />
<Compile Include="BsonWriterAdapterTests.cs" />
<Compile Include="JTokenAssertions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="JsonSerializerAdapter\JsonSerializerAdapterJValueTests.cs" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\..\src\MongoDB.Integrations.JsonDotNet\MongoDB.Integrations.JsonDotNet.csproj">
<Project>{bd207cf4-7494-4873-9d08-0fce1a6a3b3e}</Project>
<Name>MongoDB.Integrations.JsonDotNet</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Loading