diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2016-07-08 19:20:07 +0300 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2016-07-08 19:20:07 +0300 |
| commit | 9bf8d670fb9e8c223df4f4c11f4c935610b33320 (patch) | |
| tree | 535d9e7c2e8a462ab10e56be13778882ae182395 /mcs/class/Mono.Tasklets | |
| parent | 436c2cf1b39f50a17efe7a1e1cc1ae75286fa641 (diff) | |
| parent | f16741a60aabbf2bc856a8b616fd3369b74107f7 (diff) | |
Merge branch 'master' into mono4-continuations_fix
Diffstat (limited to 'mcs/class/Mono.Tasklets')
| -rw-r--r-- | mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj b/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj index 0f63283f6db..25491427421 100644 --- a/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj +++ b/mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_x.csproj @@ -9,7 +9,10 @@ <OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_x</OutputPath>
+ <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+ <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoStdLib>True</NoStdLib>
+
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -57,15 +60,14 @@ </Target>
-->
<PropertyGroup>
- <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+ <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> + </PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
-
- <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+ <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> + </PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|