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 #3769 from evincarofautumn/fix-verify-before-allocs
[mono.git]
/
mcs
/
class
/
System.Web
/
System.Web-plainweb-net_4_x.csproj
diff --git
a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
index 5308adce43f96e8cf9765d69d18c48e1312b5196..8a5e692384cb60d0ada8f86203459afdc805f888 100644
(file)
--- a/
mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
+++ b/
mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj
@@
-28,7
+28,7
@@
<DebugType>full</DebugType>
\r
<NoWarn>1699,612,618,618</NoWarn>
\r
<Optimize>false</Optimize>
\r
<DebugType>full</DebugType>
\r
<NoWarn>1699,612,618,618</NoWarn>
\r
<Optimize>false</Optimize>
\r
- <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;
DISABLE_CAS_USE;
INSIDE_SYSTEM_WEB</DefineConstants>
\r
+ <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;INSIDE_SYSTEM_WEB</DefineConstants>
\r
<ErrorReport>prompt</ErrorReport>
\r
<WarningLevel>4</WarningLevel>
\r
</PropertyGroup>
\r
<ErrorReport>prompt</ErrorReport>
\r
<WarningLevel>4</WarningLevel>
\r
</PropertyGroup>
\r
@@
-36,7
+36,7
@@
<DebugType>pdbonly</DebugType>
\r
<NoWarn>1699,612,618,618</NoWarn>
\r
<Optimize>true</Optimize>
\r
<DebugType>pdbonly</DebugType>
\r
<NoWarn>1699,612,618,618</NoWarn>
\r
<Optimize>true</Optimize>
\r
- <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;
DISABLE_CAS_USE;
INSIDE_SYSTEM_WEB</DefineConstants>
\r
+ <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;INSIDE_SYSTEM_WEB</DefineConstants>
\r
<ErrorReport>prompt</ErrorReport>
\r
<WarningLevel>4</WarningLevel>
\r
</PropertyGroup>
\r
<ErrorReport>prompt</ErrorReport>
\r
<WarningLevel>4</WarningLevel>
\r
</PropertyGroup>
\r
@@
-492,6
+492,7
@@
<Compile Include="..\referencesource\System.Web\Util\AssemblyUtil.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\BinaryCompatibility.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\DateTimeUtil.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\AssemblyUtil.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\BinaryCompatibility.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\DateTimeUtil.cs" />
\r
+ <Compile Include="..\referencesource\System.Web\Util\Debug.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\DisposableAction.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\DoNotResetAttribute.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\EmptyCollection.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\DisposableAction.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\DoNotResetAttribute.cs" />
\r
<Compile Include="..\referencesource\System.Web\Util\EmptyCollection.cs" />
\r
@@
-539,6
+540,7
@@
<Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceWriter.cs" />
\r
<Compile Include="..\System.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />
\r
<Compile Include="..\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />
\r
<Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceWriter.cs" />
\r
<Compile Include="..\System.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />
\r
<Compile Include="..\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />
\r
+ <Compile Include="..\System\System\MonoToolsLocator.cs" />
\r
<Compile Include="Assembly\AssemblyInfo.cs" />
\r
<Compile Include="Mono.Web.Util\ISectionSettingsMapper.cs" />
\r
<Compile Include="Mono.Web.Util\MembershipSectionMapper.cs" />
\r
<Compile Include="Assembly\AssemblyInfo.cs" />
\r
<Compile Include="Mono.Web.Util\ISectionSettingsMapper.cs" />
\r
<Compile Include="Mono.Web.Util\MembershipSectionMapper.cs" />
\r
@@
-1556,9
+1558,6
@@
mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\Upleve
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<Folder Include="Properties\" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
- <EmbeddedResource Include="resources/TranslationResources.resx">
\r
- <LogicalName>TranslationResources.resources</LogicalName>
\r
- </EmbeddedResource>
\r
<EmbeddedResource Include="resources/WebUIValidation.js">
\r
<LogicalName>WebUIValidation.js</LogicalName>
\r
</EmbeddedResource>
\r
<EmbeddedResource Include="resources/WebUIValidation.js">
\r
<LogicalName>WebUIValidation.js</LogicalName>
\r
</EmbeddedResource>
\r
@@
-1721,6
+1720,9
@@
mono $(ProjectDir)\..\lib\net_4_x\culevel.exe -o $(ProjectDir)\System.Web\Upleve
<EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">
\r
<LogicalName>MenuModern.js</LogicalName>
\r
</EmbeddedResource>
\r
<EmbeddedResource Include="System.Web.UI.WebControls/MenuModern.js">
\r
<LogicalName>MenuModern.js</LogicalName>
\r
</EmbeddedResource>
\r
+ <EmbeddedResource Include="resources/TranslationResources.resx">
\r
+ <LogicalName>TranslationResources.resources</LogicalName>
\r
+ </EmbeddedResource>
\r
</ItemGroup>
\r
</Project>
\r
</ItemGroup>
\r
</Project>
\r