Permalink
Browse files

merged.

  • Loading branch information...
2 parents 6188abd + 2a1daff commit 995328c3601be740d5b67303d775c608c360610f Greg Dennis committed Dec 15, 2016
Showing with 2,004 additions and 1,233 deletions.
  1. +2 −1 .gitignore
  2. +0 −6 .nuget/NuGet.Config
  3. BIN .nuget/NuGet.exe
  4. +0 −144 .nuget/NuGet.targets
  5. +17 −0 Build/nuget.ps1
  6. +25 −0 Build/project.nuspec
  7. +12 −93 Manatee.Json.Performance/Manatee.Json.Performance.csproj
  8. +1 −1 Manatee.Json.Performance/packages.config
  9. +6 −68 Manatee.Json.Tests/Manatee.Json.Tests.csproj
  10. +35 −41 Manatee.Json.sln
  11. +2 −1 Manatee.Json.sln.DotSettings.user
  12. +26 −0 Manatee.Json/DescriptionAttribute.cs
  13. +0 −107 Manatee.Json/Internal/CharacterConverter.cs
  14. +121 −0 Manatee.Json/Internal/CompatibilityExtensions.cs
  15. +24 −23 Manatee.Json/Internal/GeneralExtensions.cs
  16. +0 −67 Manatee.Json/JsonPathSyntaxException.cs
  17. +2 −0 Manatee.Json/JsonSyntaxException.cs
  18. +2 −8 Manatee.Json/JsonValue.cs
  19. +2 −0 Manatee.Json/JsonValueIncorrectTypeException.cs
  20. +310 −0 Manatee.Json/Manatee.Json-3.5.csproj
  21. +18 −0 Manatee.Json/Manatee.Json-3.5.project.json
  22. +311 −0 Manatee.Json/Manatee.Json-4.0.csproj
  23. +18 −0 Manatee.Json/Manatee.Json-4.0.project.json
  24. +434 −557 Manatee.Json/{Manatee.Json.csproj → Manatee.Json-4.5.csproj}
  25. +5 −5 Manatee.Json/{Manatee.Json.csproj.user → Manatee.Json-4.5.csproj.user}
  26. +18 −0 Manatee.Json/Manatee.Json-4.5.project.json
  27. +26 −0 Manatee.Json/Manatee.Json-Core.xproj
  28. +6 −0 Manatee.Json/Manatee.Json-Core.xproj.user
  29. +312 −0 Manatee.Json/Manatee.Json-Portable.csproj
  30. +18 −0 Manatee.Json/Manatee.Json-Portable.project.json
  31. +6 −5 Manatee.Json/Parsing/JsonParser.cs
  32. +3 −2 Manatee.Json/Path/Expressions/ConversionExpression.cs
  33. +4 −3 Manatee.Json/Path/Expressions/Parsing/JsonPathExpressionParser.cs
  34. +1 −1 Manatee.Json/Path/Expressions/Translation/ExpressionTranslator.cs
  35. +2 −2 Manatee.Json/Path/Expressions/ValueComparer.cs
  36. +2 −0 Manatee.Json/Path/JsonPathSyntaxException.cs
  37. +3 −2 Manatee.Json/Path/Parsing/JsonPathParser.cs
  38. +3 −3 Manatee.Json/Path/Parsing/{ObjectParser.cs → PathObjectParser.cs}
  39. +16 −0 Manatee.Json/ReadOnlyException.cs
  40. +2 −0 Manatee.Json/Schema/AdditionalItems.cs
  41. +2 −0 Manatee.Json/Schema/AdditionalProperties.cs
  42. +2 −0 Manatee.Json/Schema/JsonSchemaFactory.cs
  43. +8 −1 Manatee.Json/Schema/JsonSchemaOptions.cs
  44. +2 −0 Manatee.Json/Schema/JsonSchemaTypeDefinition.cs
  45. +6 −4 Manatee.Json/Schema/Validators/JsonSchemaPropertyValidatorFactory.cs
  46. +2 −1 Manatee.Json/Serialization/Internal/AutoRegistration/DictionarySerializationDelegateProvider.cs
  47. +2 −1 Manatee.Json/Serialization/Internal/AutoRegistration/ListSerializationDelegateProvider.cs
  48. +2 −1 Manatee.Json/Serialization/Internal/AutoRegistration/NullableSerializationDelegateProvider.cs
  49. +2 −1 Manatee.Json/Serialization/Internal/AutoRegistration/QueueSerializationDelegateProvider.cs
  50. +15 −1 Manatee.Json/Serialization/Internal/AutoRegistration/SerializationDelegateProviderBase.cs
  51. +2 −1 Manatee.Json/Serialization/Internal/AutoRegistration/StackSerializationDelegateProvider.cs
  52. +6 −1 Manatee.Json/Serialization/Internal/ConstructorResolver.cs
  53. +5 −5 Manatee.Json/Serialization/Internal/SerializerCache.cs
  54. +1 −0 Manatee.Json/Serialization/Internal/SerializerFactory.cs
  55. +1 −0 Manatee.Json/Serialization/Internal/SerializerMethodPair.cs
  56. +9 −5 Manatee.Json/Serialization/Internal/Serializers/AutoSerializer.cs
  57. +9 −3 Manatee.Json/Serialization/Internal/Serializers/EnumNameSerializer.cs
  58. +56 −37 Manatee.Json/Serialization/Internal/Serializers/ReflectionCache.cs
  59. +1 −4 Manatee.Json/Serialization/Internal/Serializers/StringSerializer.cs
  60. +18 −5 Manatee.Json/Serialization/Internal/TemplateGenerator.cs
  61. +4 −3 Manatee.Json/Serialization/Internal/TypeGenerator.cs
  62. +14 −13 Manatee.Json/Serialization/JsonSerializationAbstractionMap.cs
  63. +10 −5 Manatee.Json/Serialization/JsonSerializationTypeRegistry.cs
  64. +2 −0 Manatee.Json/Serialization/TypeDoesNotContainPropertyException.cs
  65. +2 −0 Manatee.Json/Serialization/TypeRegistrationException.cs
  66. +4 −1 Manatee.Json/XmlExtensions.cs
  67. +22 −0 Manatee.Json/project.json
View
@@ -8,4 +8,5 @@
/packages
/NuGet
/TestResults
-*project.lock.json
+**/*.lock.json
+**/*.nuget.targets
View
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <solution>
- <add key="disableSourceControlIntegration" value="true" />
- </solution>
-</configuration>
View
Binary file not shown.
View
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-
- <!-- Enable the restore command to run before builds -->
- <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
-
- <!-- Property that enables building a package from a project -->
- <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
- <!-- Determines if package restore consent is required to restore packages -->
- <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-
- <!-- Download NuGet.exe if it does not already exist -->
- <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
- </PropertyGroup>
-
- <ItemGroup Condition=" '$(PackageSources)' == '' ">
- <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
- <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
- <!--
- <PackageSource Include="https://www.nuget.org/api/v2/" />
- <PackageSource Include="https://my-nuget-source/nuget/" />
- -->
- </ItemGroup>
-
- <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
- <!-- Windows specific commands -->
- <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
- </PropertyGroup>
-
- <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
- <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
- <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
- </PropertyGroup>
-
- <PropertyGroup>
- <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
- <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
- </PropertyGroup>
-
- <PropertyGroup>
- <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
- <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
- </PropertyGroup>
-
- <PropertyGroup>
- <!-- NuGet command -->
- <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
- <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-
- <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
- <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 "$(NuGetExePath)"</NuGetCommand>
-
- <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-
- <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
- <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-
- <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
- <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
- <!-- Commands -->
- <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
- <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
- <!-- We need to ensure packages are restored prior to assembly resolve -->
- <BuildDependsOn Condition="$(RestorePackages) == 'true'">
- RestorePackages;
- $(BuildDependsOn);
- </BuildDependsOn>
-
- <!-- Make the build depend on restore packages -->
- <BuildDependsOn Condition="$(BuildPackage) == 'true'">
- $(BuildDependsOn);
- BuildPackage;
- </BuildDependsOn>
- </PropertyGroup>
-
- <Target Name="CheckPrerequisites">
- <!-- Raise an error if we're unable to locate nuget.exe -->
- <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
- <!--
- Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
- This effectively acts as a lock that makes sure that the download operation will only happen once and all
- parallel builds will have to wait for it to complete.
- -->
- <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
- </Target>
-
- <Target Name="_DownloadNuGet">
- <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
- </Target>
-
- <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
- <Exec Command="$(RestoreCommand)"
- Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-
- <Exec Command="$(RestoreCommand)"
- LogStandardErrorAsError="true"
- Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
- </Target>
-
- <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
- <Exec Command="$(BuildCommand)"
- Condition=" '$(OS)' != 'Windows_NT' " />
-
- <Exec Command="$(BuildCommand)"
- LogStandardErrorAsError="true"
- Condition=" '$(OS)' == 'Windows_NT' " />
- </Target>
-
- <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
- <ParameterGroup>
- <OutputFilename ParameterType="System.String" Required="true" />
- </ParameterGroup>
- <Task>
- <Reference Include="System.Core" />
- <Using Namespace="System" />
- <Using Namespace="System.IO" />
- <Using Namespace="System.Net" />
- <Using Namespace="Microsoft.Build.Framework" />
- <Using Namespace="Microsoft.Build.Utilities" />
- <Code Type="Fragment" Language="cs">
- <![CDATA[
- try {
- OutputFilename = Path.GetFullPath(OutputFilename);
-
- Log.LogMessage("Downloading latest version of NuGet.exe...");
- WebClient webClient = new WebClient();
- webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
-
- return true;
- }
- catch (Exception ex) {
- Log.LogErrorFromException(ex);
- return false;
- }
- ]]>
- </Code>
- </Task>
- </UsingTask>
-</Project>
View
@@ -0,0 +1,17 @@
+$framework35 = "..\Manatee.Json\bin\Release-3.5\";
+$framework40 = "..\Manatee.Json\bin\Release-4.0\";
+$framework45 = "..\Manatee.Json\bin\Release-4.5\";
+$frameworkCore = "..\Manatee.Json\bin\Release\netstandard1.6\";
+$frameworkMono = "..\Manatee.Json\bin\Release-Portable\";
+
+if (!(Test-Path -path $projFile)) {
+ Write-Host "Cannot find project/nuspec file '$projFile'"
+ return 1;
+}
+
+$nuget_exe = ".\nuget.exe"
+
+$sourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+Invoke-WebRequest $sourceNugetExe -OutFile $nuget_exe
+
+& $nuget_exe pack "$projFile" -NonInteractive -symbols
View
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata>
+ <!-- Required elements-->
+ <id>$id$</id>
+ <version>$version$</version>
+ <description>$description$</description>
+ <authors>$author$</authors>
+ <copyright>$copyright$</copyright>
+ <dependencies>
+ <!--Nuget dependencies must be declared here and should use version ranges:
+ [1,2) - Allows any major-version 1 package.
+ "[1" denotes start and include at 1 (1.0.0)
+ "2)" denotes end at but exclude 2 (2.0.0)
+ Without these ranges, the package will be tied to a specific version of
+ the dependency, causing Nuget Version Hell.-->
+ <!--<dependency id="Intergen.Logging" version="[0.0,0.1)"/>-->
+ </dependencies>
+ <files>
+
+ </files>
+ <!-- ... -->
+ </metadata>
+ <!-- Optional 'files' node -->
+</package>
@@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Manatee.Json.Performance</RootNamespace>
<AssemblyName>Manatee.Json.Performance</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -28,6 +28,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,109 +37,21 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.5|AnyCPU'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Debug-4.5\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.5|AnyCPU'">
- <OutputPath>bin\Release-4.5\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-3.5|AnyCPU'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Debug-3.5\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-3.5|AnyCPU'">
- <OutputPath>bin\Release-3.5\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-3.5C|AnyCPU'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Debug-3.5C\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-3.5C|AnyCPU'">
- <OutputPath>bin\Release-3.5C\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0C|AnyCPU'">
- <OutputPath>bin\Debug-4.0C\</OutputPath>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0C|AnyCPU'">
- <OutputPath>bin\Release-4.0C\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Mono|AnyCPU'">
- <OutputPath>bin\Release-Mono\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Manatee.Json.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
- <ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- </ItemGroup>
<Choose>
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</When>
- <Otherwise>
- <ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
- </ItemGroup>
- </Otherwise>
+ <Otherwise />
</Choose>
<ItemGroup>
<Compile Include="Associate.cs" />
@@ -154,11 +67,17 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Manatee.Json\Manatee.Json.csproj">
+ <ProjectReference Include="..\Manatee.Json\Manatee.Json-4.5.csproj">
<Project>{6ADF0BCF-4E46-4605-A784-51EA6DAC81C7}</Project>
- <Name>Manatee.Json</Name>
+ <Name>Manatee.Json-4.5</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ </ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
<ItemGroup>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
</packages>
Oops, something went wrong.

0 comments on commit 995328c

Please sign in to comment.