projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3040 from xmcclure/debugger-step-recursive
[mono.git]
/
mcs
/
class
/
CustomMarshalers
/
CustomMarshalers-net_4_x.csproj
diff --git
a/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj
b/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj
index 3e68f2387ae455122f6dd8dc0e40d713b9e5ddf1..bf2bc3fb53392e1f95933a009cfc1a73be4c197e 100644
(file)
--- a/
mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj
+++ b/
mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj
@@
-9,7
+9,10
@@
<OutputType>Library</OutputType>
\r
<NoWarn>1699</NoWarn>
\r
<OutputPath>./../../class/lib/net_4_x</OutputPath>
\r
<OutputType>Library</OutputType>
\r
<NoWarn>1699</NoWarn>
\r
<OutputPath>./../../class/lib/net_4_x</OutputPath>
\r
+ <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
\r
+ <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
\r
<NoStdLib>True</NoStdLib>
\r
<NoStdLib>True</NoStdLib>
\r
+
\r
<NoConfig>True</NoConfig>
\r
\r
<AppDesignerFolder>Properties</AppDesignerFolder>
\r
<NoConfig>True</NoConfig>
\r
\r
<AppDesignerFolder>Properties</AppDesignerFolder>
\r
@@
-61,15
+64,14
@@
</Target>
\r
-->
\r
<PropertyGroup>
\r
</Target>
\r
-->
\r
<PropertyGroup>
\r
- <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
\r
-
\r
+ <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
\r
</PreBuildEvent>
\r
</PreBuildEvent>
\r
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
\r
</PreBuildEvent>
\r
-
\r
- <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
\r
-
\r
+ <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
</PostBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
\r
</PostBuildEvent>
\r
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
\r
\r