Skip to content

Commit

Permalink
Merge pull request #38 from shiftbot/sl5
Browse files Browse the repository at this point in the history
Add Silverlight 5 targets
  • Loading branch information
Oren Novotny committed Mar 6, 2016
2 parents 265394c + 85738f1 commit bb29e6e
Show file tree
Hide file tree
Showing 10 changed files with 199 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Rx.NET/NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
<add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="dotnet.myget.org dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
<add key="coreclr-xunit" value="https://www.myget.org/F/coreclr-xunit/api/v3/index.json" />
<add key="Build Packages" value="https://www.myget.org/F/c037199d-41df-4567-b966-25ff65324688/api/v3/index.json" />
<add key="AspNetCIDev" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
20 changes: 20 additions & 0 deletions Rx.NET/Source/System.Reactive.Core/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,26 @@
"System.Threading.ThreadPool": "4.0.10-rc2-23811",
"System.Threading.Timer": "4.0.1-rc2-23811"
}
},
"sl5": {
"compilationOptions": {
"define": [
"NO_RXINTERFACES",
"USE_SL_DISPATCHER",
"NO_SERIALIZABLE",
"NO_REMOTING",
"NO_SEMAPHORE",
"NO_STOPWATCH",
"NO_CDS",
"NO_TASK_DELAY",
"NO_WEAKREFOFT",
"NO_SORTEDDICTIONARY",
"SILVERLIGHT",
"SILVERLIGHT5"
]
},
"dependencies": {
}
}
}
}
20 changes: 20 additions & 0 deletions Rx.NET/Source/System.Reactive.Experimental/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,26 @@
},
"dependencies": {
}
},
"sl5": {
"compilationOptions": {
"define": [
"NO_RXINTERFACES",
"USE_SL_DISPATCHER",
"NO_SERIALIZABLE",
"NO_REMOTING",
"NO_SEMAPHORE",
"NO_STOPWATCH",
"NO_CDS",
"NO_TASK_DELAY",
"NO_WEAKREFOFT",
"NO_SORTEDDICTIONARY",
"SILVERLIGHT",
"SILVERLIGHT5"
]
},
"dependencies": {
}
}
}
}
23 changes: 22 additions & 1 deletion Rx.NET/Source/System.Reactive.Interfaces/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,27 @@
"System.Runtime": "4.1.0-rc2-23811",
"System.Threading": "4.0.11-rc2-23811"
}
}
},
"sl5": {
"compilationOptions": {
"define": [
"NO_RXINTERFACES",
"USE_SL_DISPATCHER",
"NO_SERIALIZABLE",
"NO_REMOTING",
"NO_SEMAPHORE",
"NO_STOPWATCH",
"NO_CDS",
"NO_TASK_DELAY",
"NO_WEAKREFOFT",
"NO_SORTEDDICTIONARY",
"SILVERLIGHT",
"SILVERLIGHT5"
]
},
"dependencies": {
"Microsoft.TargetingPack.Private.Silverlight.v5": "1.0.2"
}
}
}
}
24 changes: 22 additions & 2 deletions Rx.NET/Source/System.Reactive.Linq/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
]
}
},
"net46": {
"net46": {
"compilationOptions": {
"define": [
"NO_EVENTARGS_CONSTRAINT",
Expand Down Expand Up @@ -116,12 +116,32 @@
"USE_TIMER_SELF_ROOT"
]
},
"imports": [ "dotnet5.4"],
"imports": [ "dotnet5.4" ],
"dependencies": {
"System.Collections.Concurrent": "4.0.12-rc2-23811",
"System.Reflection": "4.1.0-rc2-23811",
"System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23811"
}
},
"sl5": {
"compilationOptions": {
"define": [
"NO_RXINTERFACES",
"USE_SL_DISPATCHER",
"NO_SERIALIZABLE",
"NO_REMOTING",
"NO_SEMAPHORE",
"NO_STOPWATCH",
"NO_CDS",
"NO_TASK_DELAY",
"NO_WEAKREFOFT",
"NO_SORTEDDICTIONARY",
"SILVERLIGHT",
"SILVERLIGHT5"
]
},
"dependencies": {
}
}
}
}
20 changes: 20 additions & 0 deletions Rx.NET/Source/System.Reactive.Observable.Aliases/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,26 @@
},
"dependencies": {
}
},
"sl5": {
"compilationOptions": {
"define": [
"NO_RXINTERFACES",
"USE_SL_DISPATCHER",
"NO_SERIALIZABLE",
"NO_REMOTING",
"NO_SEMAPHORE",
"NO_STOPWATCH",
"NO_CDS",
"NO_TASK_DELAY",
"NO_WEAKREFOFT",
"NO_SORTEDDICTIONARY",
"SILVERLIGHT",
"SILVERLIGHT5"
]
},
"dependencies": {
}
}
}
}
20 changes: 20 additions & 0 deletions Rx.NET/Source/System.Reactive.PlatformServices/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,26 @@
"type": "build"
}
}
},
"sl5": {
"compilationOptions": {
"define": [
"NO_RXINTERFACES",
"USE_SL_DISPATCHER",
"NO_SERIALIZABLE",
"NO_REMOTING",
"NO_SEMAPHORE",
"NO_STOPWATCH",
"NO_CDS",
"NO_TASK_DELAY",
"NO_WEAKREFOFT",
"NO_SORTEDDICTIONARY",
"SILVERLIGHT",
"SILVERLIGHT5"
]
},
"dependencies": {
}
}
}
}
22 changes: 21 additions & 1 deletion Rx.NET/Source/System.Reactive.Providers/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
]
},
"dependencies": {

}
},
"net46": {
Expand Down Expand Up @@ -115,6 +115,26 @@
"dependencies": {
"System.Linq.Queryable": "4.0.1-rc2-23811"
}
},
"sl5": {
"compilationOptions": {
"define": [
"NO_RXINTERFACES",
"USE_SL_DISPATCHER",
"NO_SERIALIZABLE",
"NO_REMOTING",
"NO_SEMAPHORE",
"NO_STOPWATCH",
"NO_CDS",
"NO_TASK_DELAY",
"NO_WEAKREFOFT",
"NO_SORTEDDICTIONARY",
"SILVERLIGHT",
"SILVERLIGHT5"
]
},
"dependencies": {
}
}
}
}
20 changes: 20 additions & 0 deletions Rx.NET/Source/System.Reactive.Windows.Threading/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,26 @@
"System.Diagnostics.Debug": "4.0.11-rc2-23811",
"System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23811"
}
},
"sl5": {
"compilationOptions": {
"define": [
"NO_RXINTERFACES",
"USE_SL_DISPATCHER",
"NO_SERIALIZABLE",
"NO_REMOTING",
"NO_SEMAPHORE",
"NO_STOPWATCH",
"NO_CDS",
"NO_TASK_DELAY",
"NO_WEAKREFOFT",
"NO_SORTEDDICTIONARY",
"SILVERLIGHT",
"SILVERLIGHT5"
]
},
"dependencies": {
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata minClientVersion="3.0">
<id>Microsoft.TargetingPack.Private.Silverlight.v5</id>
<version>1.0.2</version>
<title>Microsoft.TargetingPack.Private.Silverlight.v5</title>
<authors>Microsoft</authors>
<owners>microsoft,dotnetframework</owners>
<licenseUrl>http://go.microsoft.com/fwlink/?LinkId=329770</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Contains a private targeting pack which contains only SL5 Reference Assemblies and is used for producing platform specific libraries in .NET Core only.</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\Microsoft.VisualBasic.dll" target="lib\sl50\Microsoft.VisualBasic.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\Microsoft.Xna.Framework.dll" target="lib\sl50\Microsoft.Xna.Framework.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\Microsoft.Xna.Framework.Graphics.dll" target="lib\sl50\Microsoft.Xna.Framework.Graphics.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\Microsoft.Xna.Framework.Graphics.Shaders.dll" target="lib\sl50\Microsoft.Xna.Framework.Graphics.Shaders.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.Core.dll" target="lib\sl50\System.Core.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\system.dll" target="lib\sl50\system.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.Net.dll" target="lib\sl50\System.Net.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.Runtime.Serialization.dll" target="lib\sl50\System.Runtime.Serialization.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.ServiceModel.dll" target="lib\sl50\System.ServiceModel.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.ServiceModel.Web.dll" target="lib\sl50\System.ServiceModel.Web.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.Windows.Browser.dll" target="lib\sl50\System.Windows.Browser.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.Windows.dll" target="lib\sl50\System.Windows.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.Windows.Xna.dll" target="lib\sl50\System.Windows.Xna.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\System.Xml.dll" target="lib\sl50\System.Xml.dll" />
<file src="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Silverlight\v5.0\mscorlib.dll" target="lib\sl50\mscorlib.dll" />
</files>
</package>

0 comments on commit bb29e6e

Please sign in to comment.