-Added project specific project.json files

This commit is contained in:
James Newton-King
2015-09-22 11:38:13 +12:00
parent ddfd52f79c
commit d86d2fa23d
31 changed files with 219 additions and 100 deletions
+1 -2
View File
@@ -11,8 +11,7 @@ AppPackages/
_ReSharper.* _ReSharper.*
*.ReSharper.user *.ReSharper.user
*.resharper.user *.resharper.user
project.lock.json *.lock.json
*.xproj
.vs/ .vs/
*.props *.props
*.targets *.targets
+12 -10
View File
@@ -11,7 +11,7 @@
$buildNuGet = $true $buildNuGet = $true
$treatWarningsAsErrors = $false $treatWarningsAsErrors = $false
$workingName = if ($workingName) {$workingName} else {"Working"} $workingName = if ($workingName) {$workingName} else {"Working"}
$dnvmVersion = "1.0.0-beta8-15530" $dnvmVersion = "1.0.0-beta8-15618"
$baseDir = resolve-path .. $baseDir = resolve-path ..
$buildDir = "$baseDir\Build" $buildDir = "$baseDir\Build"
@@ -56,7 +56,7 @@ task Clean {
task Build -depends Clean { task Build -depends Clean {
Write-Host "Copying source to working source directory $workingSourceDir" Write-Host "Copying source to working source directory $workingSourceDir"
robocopy $sourceDir $workingSourceDir /MIR /NP /XD bin obj TestResults AppPackages $packageDirs /XF *.suo *.user | Out-Default robocopy $sourceDir $workingSourceDir /MIR /NP /XD bin obj TestResults AppPackages $packageDirs /XF *.suo *.user *.project.lock.json | Out-Default
Write-Host -ForegroundColor Green "Updating assembly version" Write-Host -ForegroundColor Green "Updating assembly version"
Write-Host Write-Host
@@ -130,7 +130,7 @@ task Package -depends Build {
} }
} }
robocopy $workingSourceDir $workingDir\NuGet\src *.cs /S /NFL /NDL /NJS /NC /NS /NP /XD Newtonsoft.Json.Tests Newtonsoft.Json.TestConsole obj | Out-Default robocopy $workingSourceDir $workingDir\NuGet\src *.cs /S /NFL /NDL /NJS /NC /NS /NP /XD Newtonsoft.Json.Tests Newtonsoft.Json.TestConsole obj .vs artifacts | Out-Default
Write-Host "Building NuGet package with ID $packageId and version $nugetVersion" -ForegroundColor Green Write-Host "Building NuGet package with ID $packageId and version $nugetVersion" -ForegroundColor Green
Write-Host Write-Host
@@ -195,21 +195,22 @@ function MSBuildBuild($build)
$finalDir = $build.FinalDir $finalDir = $build.FinalDir
Write-Host Write-Host
Write-Host "Restoring $workingSourceDir\$name.sln" Write-Host "Restoring $workingSourceDir\$name.sln" -ForegroundColor Green
[Environment]::SetEnvironmentVariable("EnableNuGetPackageRestore", "true", "Process") [Environment]::SetEnvironmentVariable("EnableNuGetPackageRestore", "true", "Process")
exec { .\Tools\NuGet\NuGet.exe update -self } exec { .\Tools\NuGet\NuGet.exe update -self }
exec { .\Tools\NuGet\NuGet.exe restore "$workingSourceDir\$name.sln" -verbosity detailed | Out-Default } "Error restoring $name" exec { .\Tools\NuGet\NuGet.exe restore "$workingSourceDir\$name.sln" -verbosity detailed -configfile $workingSourceDir\nuget.config | Out-Default } "Error restoring $name"
$constants = GetConstants $build.Constants $signAssemblies $constants = GetConstants $build.Constants $signAssemblies
Write-Host Write-Host
Write-Host "Building" Write-Host "Building $workingSourceDir\$name.sln" -ForegroundColor Green
exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:Platform=Any CPU" /p:OutputPath=bin\Release\$finalDir\ /p:AssemblyOriginatorKeyFile=$signKeyPath "/p:SignAssembly=$signAssemblies" "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" "/p:VisualStudioVersion=14.0" /p:DefineConstants=`"$constants`" "$workingSourceDir\$name.sln" | Out-Default } "Error building $name" exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:CopyNuGetImplementations=true" "/p:Platform=Any CPU" "/p:PlatformTarget=AnyCPU" /p:OutputPath=bin\Release\$finalDir\ /p:AssemblyOriginatorKeyFile=$signKeyPath "/p:SignAssembly=$signAssemblies" "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" "/p:VisualStudioVersion=14.0" /p:DefineConstants=`"$constants`" "$workingSourceDir\$name.sln" | Out-Default } "Error building $name"
} }
function DnxBuild($build) function DnxBuild($build)
{ {
$name = $build.Name $name = $build.Name
$projectPath = "$workingSourceDir\Newtonsoft.Json\project.json"
exec { dnvm install $dnvmVersion -r clr -u | Out-Default } exec { dnvm install $dnvmVersion -r clr -u | Out-Default }
exec { dnvm use $dnvmVersion -r clr | Out-Default } exec { dnvm use $dnvmVersion -r clr | Out-Default }
@@ -218,7 +219,7 @@ function DnxBuild($build)
Write-Host Write-Host
exec { exec {
try { try {
dnu restore "$workingSourceDir\Newtonsoft.Json\project.json" | Out-Default dnu restore $projectPath | Out-Default
Write-Host "Restore last exit code: $lastexitcode" Write-Host "Restore last exit code: $lastexitcode"
} }
catch [System.Management.Automation.RemoteException] catch [System.Management.Automation.RemoteException]
@@ -230,7 +231,8 @@ function DnxBuild($build)
} }
} }
exec { dnu build "$workingSourceDir\Newtonsoft.Json\project.json" --configuration Release | Out-Default } Write-Host -ForegroundColor Green "Building $projectPath"
exec { dnu build $projectPath --configuration Release | Out-Default }
} }
function DnxTests($build) function DnxTests($build)
@@ -266,7 +268,7 @@ function DnxTests($build)
try try
{ {
Set-Location "$workingSourceDir\Newtonsoft.Json.Tests" Set-Location "$workingSourceDir\Newtonsoft.Json.Tests"
exec { dnx -p "$workingSourceDir\Newtonsoft.Json.Tests\project.json" --configuration Release test | Out-Default } exec { dnx --configuration Release test | Out-Default }
} }
finally finally
{ {
+5 -1
View File
@@ -99,7 +99,11 @@ catch
if ($selection.Text.StartsWith("Attempting to gather dependencies information for package 'Newtonsoft.Json." + $package.Version + "'")) if ($selection.Text.StartsWith("Attempting to gather dependencies information for package 'Newtonsoft.Json." + $package.Version + "'"))
{ {
$dte2.ItemOperations.Navigate($url) | Out-Null # don't show on upgrade
if (!$selection.Text.Contains("Removed package"))
{
$dte2.ItemOperations.Navigate($url) | Out-Null
}
} }
} }
catch catch
+4 -2
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<topic id="SerializationAttributes" revisionNumber="1"> <topic id="SerializationAttributes" revisionNumber="1">
<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink"> <developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -60,7 +60,9 @@
<section> <section>
<title>JsonArrayAttribute/JsonDictionaryAttribute</title> <title>JsonArrayAttribute/JsonDictionaryAttribute</title>
<content> <content>
<para>The JsonArrayAttribute and JsonDictionaryAttributes are used to specify whether a class is serialized as that collection type.</para> <para>The <codeEntityReference>T:Newtonsoft.Json.JsonArrayAttribute</codeEntityReference> and
<codeEntityReference>T:Newtonsoft.Json.JsonDictionaryAttribute</codeEntityReference> are used to specify
whether a class is serialized as that collection type.</para>
<para>The collection attributes have options to customize the JsonConverter, type name handling, and reference handling that are applied to collection items.</para> <para>The collection attributes have options to customize the JsonConverter, type name handling, and reference handling that are applied to collection items.</para>
</content> </content>
</section> </section>
+10 -10
View File
@@ -9,9 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
NuGet.Config = NuGet.Config NuGet.Config = NuGet.Config
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Dotnet", "Newtonsoft.Json\Newtonsoft.Json.Dotnet.xproj", "{2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Dotnet", "Newtonsoft.Json\Newtonsoft.Json.Dotnet.xproj", "{779E052E-7218-4DA3-B419-FFB0F4C95081}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Tests.Dotnet", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.Dotnet.xproj", "{A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Tests.Dotnet", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.Dotnet.xproj", "{13E906AE-5A47-4354-8CAF-E63E8AC541ED}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +19,14 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {779E052E-7218-4DA3-B419-FFB0F4C95081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}.Debug|Any CPU.Build.0 = Debug|Any CPU {779E052E-7218-4DA3-B419-FFB0F4C95081}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}.Release|Any CPU.ActiveCfg = Release|Any CPU {779E052E-7218-4DA3-B419-FFB0F4C95081}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}.Release|Any CPU.Build.0 = Release|Any CPU {779E052E-7218-4DA3-B419-FFB0F4C95081}.Release|Any CPU.Build.0 = Release|Any CPU
{A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}.Release|Any CPU.Build.0 = Release|Any CPU {13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -0,0 +1,8 @@
{
"frameworks": {
"net45": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>13e906ae-5a47-4354-8caf-e63e8ac541ed</ProjectGuid>
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
@@ -65,10 +65,6 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
@@ -132,9 +128,7 @@
<Compile Include="TestObjects\ContentBaseClass.cs" /> <Compile Include="TestObjects\ContentBaseClass.cs" />
<Compile Include="TestObjects\ContentSubClass.cs" /> <Compile Include="TestObjects\ContentSubClass.cs" />
<Compile Include="TestObjects\Currency.cs" /> <Compile Include="TestObjects\Currency.cs" />
<Compile Include="TestObjects\CustomerDataSet.cs"> <Compile Include="TestObjects\CustomerDataSet.cs" />
<SubType>Component</SubType>
</Compile>
<Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" /> <Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" />
<Compile Include="TestObjects\DateTimeWrapper.cs" /> <Compile Include="TestObjects\DateTimeWrapper.cs" />
<Compile Include="TestObjects\DecimalTestClass.cs" /> <Compile Include="TestObjects\DecimalTestClass.cs" />
@@ -349,6 +343,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Newtonsoft.Json.Tests.Net20.project.json" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
@@ -0,0 +1,11 @@
{
"dependencies": {
"NUnit": "2.6.2"
},
"frameworks": {
"net20": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -67,10 +67,6 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations"> <Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -361,6 +357,7 @@
<Content Include="SpaceShipV2.bson"> <Content Include="SpaceShipV2.bson">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="Newtonsoft.Json.Tests.Net35.project.json" />
<None Include="TestObjects\SqlTypesDataSet.xsc"> <None Include="TestObjects\SqlTypesDataSet.xsc">
<DependentUpon>SqlTypesDataSet.xsd</DependentUpon> <DependentUpon>SqlTypesDataSet.xsd</DependentUpon>
</None> </None>
@@ -0,0 +1,11 @@
{
"dependencies": {
"NUnit": "2.6.2"
},
"frameworks": {
"net35": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -68,15 +68,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FSharp.Core.4.0.0\lib\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations"> <Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -296,9 +288,7 @@
<Compile Include="TestObjects\ContentBaseClass.cs" /> <Compile Include="TestObjects\ContentBaseClass.cs" />
<Compile Include="TestObjects\ContentSubClass.cs" /> <Compile Include="TestObjects\ContentSubClass.cs" />
<Compile Include="TestObjects\Currency.cs" /> <Compile Include="TestObjects\Currency.cs" />
<Compile Include="TestObjects\CustomerDataSet.cs"> <Compile Include="TestObjects\CustomerDataSet.cs" />
<SubType>Component</SubType>
</Compile>
<Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" /> <Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" />
<Compile Include="TestObjects\DateTimeWrapper.cs" /> <Compile Include="TestObjects\DateTimeWrapper.cs" />
<Compile Include="TestObjects\DecimalTestClass.cs" /> <Compile Include="TestObjects\DecimalTestClass.cs" />
@@ -480,6 +470,7 @@
<LastGenOutput>LinqToSqlClasses.designer.cs</LastGenOutput> <LastGenOutput>LinqToSqlClasses.designer.cs</LastGenOutput>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>
<None Include="Newtonsoft.Json.Tests.Net40.project.json" />
<None Include="Schema\Specs\additionalItems.json"> <None Include="Schema\Specs\additionalItems.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
@@ -0,0 +1,12 @@
{
"dependencies": {
"NUnit": "2.6.2",
"FSharp.Core": "4.0.0"
},
"frameworks": {
"net40": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -69,19 +69,8 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FSharp.Core.4.0.0\lib\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations"> <Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference> </Reference>
@@ -391,6 +380,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Newtonsoft.Json.Tests.Portable.project.json" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
@@ -0,0 +1,13 @@
{
"dependencies": {
"FSharp.Core": "4.0.0",
"NUnit": "2.6.2",
"System.Collections.Immutable": "1.1.36"
},
"frameworks": {
"net45": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -69,15 +69,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FSharp.Core.4.0.0\lib\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations"> <Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -396,6 +388,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Newtonsoft.Json.Tests.Portable40.project.json" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
@@ -0,0 +1,12 @@
{
"dependencies": {
"FSharp.Core": "4.0.0",
"NUnit": "2.6.2"
},
"frameworks": {
"net40": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -32,22 +32,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Autofac">
<HintPath>..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
</Reference>
<Reference Include="FSharp.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FSharp.Core.4.0.0\lib\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Data.Entity" /> <Reference Include="System.Data.Entity" />
@@ -333,9 +318,7 @@
<Compile Include="TestObjects\ConverterPrecedenceClass.cs" /> <Compile Include="TestObjects\ConverterPrecedenceClass.cs" />
<Compile Include="TestObjects\ConverterPrecedenceClassConverter.cs" /> <Compile Include="TestObjects\ConverterPrecedenceClassConverter.cs" />
<Compile Include="TestObjects\Currency.cs" /> <Compile Include="TestObjects\Currency.cs" />
<Compile Include="TestObjects\CustomerDataSet.cs"> <Compile Include="TestObjects\CustomerDataSet.cs" />
<SubType>Component</SubType>
</Compile>
<Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" /> <Compile Include="TestObjects\DataContractSerializationAttributesClass.cs" />
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" /> <Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
<Compile Include="TestObjects\DateTimeTestClass.cs" /> <Compile Include="TestObjects\DateTimeTestClass.cs" />
@@ -468,9 +451,7 @@
<LastGenOutput>LinqToSqlClasses.designer.cs</LastGenOutput> <LastGenOutput>LinqToSqlClasses.designer.cs</LastGenOutput>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>
<None Include="packages.config"> <None Include="Newtonsoft.Json.Tests.project.json" />
<SubType>Designer</SubType>
</None>
<None Include="Schema\Specs\additionalItems.json"> <None Include="Schema\Specs\additionalItems.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
@@ -0,0 +1,14 @@
{
"dependencies": {
"Autofac": "4.0.0-beta7-130",
"FSharp.Core": "4.0.0",
"NUnit": "2.6.2",
"System.Collections.Immutable": "1.1.36"
},
"frameworks": {
"net45": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="3.5.0" targetFramework="net45" />
<package id="FSharp.Core" version="4.0.0" targetFramework="net45" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
</packages>
+1 -2
View File
@@ -27,7 +27,7 @@
"System.Xml.Linq": "" "System.Xml.Linq": ""
}, },
"dependencies": { "dependencies": {
"Autofac": "3.5.0", "Autofac": "4.0.0-beta7-130",
"FSharp.Core": "4.0.0.1", "FSharp.Core": "4.0.0.1",
"NUnit": "2.6.4", "NUnit": "2.6.4",
"System.Collections.Immutable": "1.1.37" "System.Collections.Immutable": "1.1.37"
@@ -51,7 +51,6 @@
"System.Xml.Linq": "" "System.Xml.Linq": ""
}, },
"dependencies": { "dependencies": {
"Autofac": "3.5.0",
"FSharp.Core": "4.0.0.1", "FSharp.Core": "4.0.0.1",
"NUnit": "2.6.4" "NUnit": "2.6.4"
} }
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>779e052e-7218-4da3-b419-ffb0f4c95081</ProjectGuid>
<RootNamespace>Newtonsoft.Json</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
@@ -0,0 +1,8 @@
{
"frameworks": {
"net20": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -0,0 +1,8 @@
{
"frameworks": {
"net35": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -0,0 +1,8 @@
{
"frameworks": {
"net40": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -0,0 +1,8 @@
{
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile259": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -0,0 +1,8 @@
{
"frameworks": {
".NETPortable,Version=v4.0,Profile=Profile328": {}
},
"runtimes": {
"win-anycpu": {}
}
}
@@ -0,0 +1,8 @@
{
"frameworks": {
"net45": {}
},
"runtimes": {
"win-anycpu": {}
}
}
+3 -3
View File
@@ -3,8 +3,8 @@
<packageSources> <packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below --> <!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear /> <clear />
<add key="AspNet VNext (CI Builds)" value="https://www.myget.org/F/aspnetvnext/" /> <add key="AspNet VNext (CI Builds)" value="https://www.myget.org/F/aspnetvnext/api/v2" />
<add key="xunit (CI Builds)" value="https://www.myget.org/F/xunit/" /> <add key="xunit (CI Builds)" value="https://www.myget.org/F/xunit/api/v2" />
<add key="NuGet.org (v2)" value="https://www.nuget.org/api/v2/" /> <add key="NuGet.org (v2)" value="https://www.nuget.org/api/v2" />
</packageSources> </packageSources>
</configuration> </configuration>
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"projects": [ "src" ], "projects": [ "src" ],
"sdk": { "sdk": {
"version": "1.0.0-beta8-15530" "version": "1.0.0-beta8-15618"
} }
} }
Binary file not shown.