Skip to content

Commit

Permalink
updating project.json files and global.json
Browse files Browse the repository at this point in the history
  • Loading branch information
clarkis117 committed Mar 5, 2017
1 parent 280c445 commit ba3f4b4
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 22 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-preview2-003121"
"version": "1.0.0-preview2-1-003177"
}
}
6 changes: 4 additions & 2 deletions src/Mime-Detective/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"authors": [ "Mime-Detective Collaborators" ],

"dependencies": {
"NETStandard.Library": "1.6.1",
"System.Xml.XmlSerializer": "*"
"NETStandard.Library": "1.6.1"
},

"frameworks": {
Expand Down Expand Up @@ -60,6 +59,9 @@
}
},
"netstandard1.3": {
"dependencies": {
"System.Xml.XmlSerializer": "*"
}
}
}
}
40 changes: 22 additions & 18 deletions test/Mime-Detective.Tests/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit ba3f4b4

Please sign in to comment.