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

Make TPL code Silverlight 5 compatible #148

Merged
merged 4 commits into from
Aug 13, 2015
Merged

Conversation

iskiselev
Copy link
Contributor

Per discussion in #66, Silverlight 4 support was dropped and added TPL Task support to SL5 version. #70 just disabled TPL Task support for Silverlifht version, this PR re-enable it.

@kzu
Copy link
Member

kzu commented Jun 30, 2015

Do we still need this? The SL is already 5.0, not sure we need to rebase this PR to get it in?

@iskiselev
Copy link
Contributor Author

I think we still need this. I've rebased PR.

@@ -239,4 +242,11 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine moving to Castle nuget, but let us not go down the old nuget restore rabbit whole ;)

@iskiselev
Copy link
Contributor Author

Removed Nuget restore.

@@ -21,6 +21,8 @@
<AssemblyOriginatorKeyFile>..\Moq.snk</AssemblyOriginatorKeyFile>
<SignManifests>false</SignManifests>
<OldToolsVersion>4.0</OldToolsVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these two properties are part of nuget restore and should be gone too

@kzu
Copy link
Member

kzu commented Aug 13, 2015

Hm.. the main csproj has them, so merging :)

kzu added a commit that referenced this pull request Aug 13, 2015
Make TPL code Silverlight 5 compatible
@kzu kzu merged commit 061ed36 into devlooped:master Aug 13, 2015
@iskiselev
Copy link
Contributor Author

I've created fix without them. Should I create new PR or will you leave this NuGet properties?

@kzu
Copy link
Member

kzu commented Aug 13, 2015

leave them there, no worries.

thanks for the fix!

On Wed, Aug 12, 2015 at 11:58 PM Igor Kiselev notifications@github.com
wrote:

I've created fix without them. Should I create new PR or will you leave
this NuGet properties?


Reply to this email directly or view it on GitHub
#148 (comment).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants