Skip to content
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

Update .NET core dependencies to RTM #7580

Merged
merged 5 commits into from
Aug 2, 2016
Merged

Update .NET core dependencies to RTM #7580

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
660333a
update project.json templates to RTM .NET core nugets
jtattermusch Jul 22, 2016
36d1540
use netcoreapp1.0 for executable projects
jtattermusch Jul 26, 2016
3fc8c8a
regenerate
jtattermusch Jul 22, 2016
1c0f30c
fix conditional compilation for netcoreapp1.0 projects
jtattermusch Jul 29, 2016
0a5a0ca
build everything
jtattermusch Jul 29, 2016
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
Prev Previous commit
Next Next commit
regenerate
  • Loading branch information
@jtattermusch
jtattermusch committed Jul 29, 2016
commit 3fc8c8a9ff0402e3aa699c8ae4f9acf893c61fc9
6 changes: 3 additions & 3 deletions src/csharp/Grpc.Auth/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"net45"
],
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-24027",
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Threading.Tasks": "4.0.11-rc2-24027"
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"NETStandard.Library": "1.6.0",
"System.Threading.Tasks": "4.0.11"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.Core.Tests/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/csharp/Grpc.Core/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"portable-net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027"
"NETStandard.Library": "1.6.0",
"System.Threading.Thread": "4.0.0"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.Examples.MathClient/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.Examples.MathServer/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.Examples.Tests/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,13 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/csharp/Grpc.Examples/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"portable-net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.HealthCheck.Tests/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,13 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/csharp/Grpc.HealthCheck/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"portable-net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.IntegrationTesting.Client/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,14 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45",
"net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.IntegrationTesting.QpsWorker/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,14 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45",
"net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.IntegrationTesting.Server/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,14 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45",
"net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/csharp/Grpc.IntegrationTesting.StressClient/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,14 @@
},
"frameworks": {
"net45": { },
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45",
"net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/csharp/Grpc.IntegrationTesting/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,15 @@
"System.IO": ""
}
},
"netstandard1.5": {
"netcoreapp1.0": {
"imports": [
"portable-net45",
"net45"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027"
"Microsoft.NETCore.App": "1.0.0",
"NETStandard.Library": "1.6.0",
"System.Linq.Expressions": "4.1.0"
}
}
}
Expand Down