diff options
author | Vlad Brezae <brezaevlad@gmail.com> | 2018-10-30 22:48:46 +0300 |
---|---|---|
committer | Ludovic Henry <luhenry@microsoft.com> | 2018-10-30 22:48:46 +0300 |
commit | 5204ef1f5c694c89f5b1b9e70a440a70422b71bf (patch) | |
tree | c4eed6836535c85fe1d20962163f76151f7572bf /mcs/class/System.ServiceModel | |
parent | 555e5c521476cff3e0a20482e1f0feae761a9d1d (diff) |
[tests] Add new build profile for testing mixed mode (#11307)
We aot only the bcl (--aot=full,interp) while the tests code is interpreted.
<!--
Thank you for your Pull Request!
If you are new to contributing to Mono, please try to do your best at conforming to our coding guidelines http://www.mono-project.com/community/contributing/coding-guidelines/ but don't worry if you get something wrong. One of the project members will help you to get things landed.
Does your pull request fix any of the existing issues? Please use the following format: Fixes #issue-number
-->
Diffstat (limited to 'mcs/class/System.ServiceModel')
-rw-r--r-- | mcs/class/System.ServiceModel/System.ServiceModel.csproj | 21 | ||||
-rw-r--r-- | mcs/class/System.ServiceModel/testing_aot_full_interp_System.ServiceModel.dll.sources | 1 |
2 files changed, 21 insertions, 1 deletions
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.csproj b/mcs/class/System.ServiceModel/System.ServiceModel.csproj index 009eba2a95e..e18fe9404d8 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.csproj +++ b/mcs/class/System.ServiceModel/System.ServiceModel.csproj @@ -49,10 +49,15 @@ <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV;TRACE</DefineConstants>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
+ <OutputPath>./../../class/lib/testing_aot_full_interp</OutputPath>
+ <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
+ <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;DISABLE_COM;TRACE</DefineConstants>
+ </PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
<OutputPath>./../../class/lib/testing_aot_hybrid</OutputPath>
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
- <DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;TRACE</DefineConstants>
+ <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
<OutputPath>./../../class/lib/testing_aot_full</OutputPath>
@@ -1155,6 +1160,12 @@ <ProjectReference Include="../System.Web/System.Web.csproj" />
<ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices.csproj" />
</ItemGroup>
+ <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
+ <Reference Include="nunitlite">
+ <HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ </ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
<Reference Include="nunitlite">
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
@@ -1219,6 +1230,14 @@ <LogicalName>WS-Addressing.schema</LogicalName>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
+ <EmbeddedResource Include="resources/ws-addr.xsd">
+ <LogicalName>ws-addr.xsd</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="resources/WS-Addressing.schema">
+ <LogicalName>WS-Addressing.schema</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
<EmbeddedResource Include="resources/ws-addr.xsd">
<LogicalName>ws-addr.xsd</LogicalName>
diff --git a/mcs/class/System.ServiceModel/testing_aot_full_interp_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/testing_aot_full_interp_System.ServiceModel.dll.sources new file mode 100644 index 00000000000..22ece5ce8ce --- /dev/null +++ b/mcs/class/System.ServiceModel/testing_aot_full_interp_System.ServiceModel.dll.sources @@ -0,0 +1 @@ +#include mobile_System.ServiceModel.dll.sources |