From ba3f4b4d78dca54f327d1780a9d972e61b755819 Mon Sep 17 00:00:00 2001 From: Joshua Clark Date: Sun, 5 Mar 2017 16:15:30 -0500 Subject: [PATCH] updating project.json files and global.json --- appveyor.yml | 2 +- global.json | 2 +- src/Mime-Detective/project.json | 6 ++-- test/Mime-Detective.Tests/project.json | 40 ++++++++++++++------------ 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f89126b..cde58c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ install: - ps: mkdir -Force ".\build\" | Out-Null - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1" - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli" - - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121' + - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-1-003177' - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" build_script: - ps: ./Build.ps1 diff --git a/global.json b/global.json index 564162d..b33f3c9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0-preview2-003121" + "version": "1.0.0-preview2-1-003177" } } \ No newline at end of file diff --git a/src/Mime-Detective/project.json b/src/Mime-Detective/project.json index 34f9b1b..5caaa5f 100644 --- a/src/Mime-Detective/project.json +++ b/src/Mime-Detective/project.json @@ -18,8 +18,7 @@ "authors": [ "Mime-Detective Collaborators" ], "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Xml.XmlSerializer": "*" + "NETStandard.Library": "1.6.1" }, "frameworks": { @@ -60,6 +59,9 @@ } }, "netstandard1.3": { + "dependencies": { + "System.Xml.XmlSerializer": "*" + } } } } diff --git a/test/Mime-Detective.Tests/project.json b/test/Mime-Detective.Tests/project.json index 7c4d0b7..2b78e8a 100644 --- a/test/Mime-Detective.Tests/project.json +++ b/test/Mime-Detective.Tests/project.json @@ -3,30 +3,34 @@ "dependencies": { "Mime-Detective": { "target": "project" }, - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-rc2-build10025", + "xunit": "2.2.0", + "dotnet-test-xunit": "2.2.0-preview2-build1029", "NETStandard.Library": "1.6.1" }, "buildOptions": {"copyToOutput": "Data\\"}, "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - }, - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - }, - "net4.5.1": { - }, - "net4.5.2": { - }, + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.3" + } + } + }, + "netcoreapp1.1": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.1.0" + } + } + }, + "net4.5.1": { + }, + "net4.5.2": { + }, "net4.6": { }, "net4.6.1": {