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.

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

Hotfix to reduce dependencies for net45 #298

Merged
merged 3 commits into from
Nov 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion Ix.NET/Source/NuSpecs/System.Interactive.Async.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
<language>en-US</language>
<tags>Ix Interactive Extensions Enumerable Asynchronous</tags>
<dependencies>
<dependency id="NETStandard.Library" version="1.6.0" />
<group targetFramework="netstandard1.0">
<dependency id="NETStandard.Library" version="1.6.0" />
</group>
<group targetFramework="net45" />
</dependencies>
</metadata>
<files>
Expand Down
5 changes: 4 additions & 1 deletion Ix.NET/Source/NuSpecs/System.Interactive.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
<language>en-US</language>
<tags>Ix Interactive Extensions Enumerable</tags>
<dependencies>
<dependency id="NETStandard.Library" version="1.6.0" />
<group targetFramework="netstandard1.0">
<dependency id="NETStandard.Library" version="1.6.0" />
</group>
<group targetFramework="net45" />
</dependencies>
</metadata>
<files>
Expand Down
10 changes: 6 additions & 4 deletions Ix.NET/Source/System.Interactive.Async/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
}
},

"dependencies": {
"NETStandard.Library": "1.6.0"
},

"frameworks": {
"net45": {
"buildOptions": {
Expand Down Expand Up @@ -58,6 +54,9 @@
"CRIPPLED_REFLECTION",
"PLIB"
]
},
"dependencies": {
"NETStandard.Library": "1.6.0"
}
},
"netstandard1.3": {
Expand All @@ -67,6 +66,9 @@
"NO_CODE_COVERAGE_ATTRIBUTE",
"PLIB"
]
},
"dependencies": {
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions Ix.NET/Source/System.Interactive/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
}
},

"dependencies": {
"NETStandard.Library": "1.6.0"
},

"frameworks": {
"net45": {
"buildOptions": {
Expand All @@ -46,6 +42,9 @@
"CRIPPLED_REFLECTION",
"PLIB"
]
},
"dependencies": {
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion Ix.NET/Source/global.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"projects": [ ".", "tests" ]
"projects": [ ".", "tests" ],
"sdk": {
"version": "1.0.0-preview2-003131"
}
}
5 changes: 4 additions & 1 deletion Rx.NET/Source/NuSpecs/System.Reactive.Interfaces.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
<language>en-US</language>
<tags>Rx Reactive Extensions Observable LINQ Events</tags>
<dependencies>
<dependency id="NETStandard.Library" version="1.6.0" />
<group targetFramework="netstandard1.0">
<dependency id="NETStandard.Library" version="1.6.0" />
</group>
<group targetFramework="net45" />
</dependencies>
</metadata>
<files>
Expand Down
9 changes: 4 additions & 5 deletions Rx.NET/Source/System.Reactive.Interfaces/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@
"includeFiles": [ "../GlobalAssemblyVersion.cs" ]
}
},

"dependencies": {
"NETStandard.Library": "1.6.0"
},


"frameworks": {
"net45": {
"buildOptions": {
Expand Down Expand Up @@ -64,6 +60,9 @@
"USE_TIMER_SELF_ROOT",
"PLIB"
]
},
"dependencies": {
"NETStandard.Library": "1.6.0"
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion Rx.NET/Source/global.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"projects": [ ".", "Tests.System.Reactive" ]
"projects": [ ".", "Tests.System.Reactive" ],
"sdk": {
"version": "1.0.0-preview2-003131"
}
}