diff options
author | monojenkins <jo.shields+jenkins@xamarin.com> | 2018-03-28 20:29:28 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-03-28 20:29:28 +0300 |
commit | 2f66873ab2a10034b281dc2229811421786f3434 (patch) | |
tree | ea1a479870581eafeb782bf3ed96a7386f0064a6 /mcs/class/System.Reactive.Linq | |
parent | 753cc874f640f8734908ac8d1311b57b6613acd2 (diff) |
[msvc] Update csproj files (#7811)
* [msvc] Update csproj files
* [msvc] Delete old net_4_x.csproj and xbuild_12.csproj files
Diffstat (limited to 'mcs/class/System.Reactive.Linq')
-rw-r--r-- | mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj (renamed from mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj) | 114 |
1 files changed, 34 insertions, 80 deletions
diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj b/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj index 1fb719c8e65..95246e53d04 100644 --- a/mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_x.csproj +++ b/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj @@ -1,61 +1,50 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{EE5FC05D-135B-460A-9F0D-7F5084F4DBD7}</ProjectGuid>
+ <ProjectGuid>{AE7A4105-A1FE-4469-A3E1-B93B55ED4F5E}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<LangVersion>latest</LangVersion>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
- <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
- <IntermediateOutputPath>obj-net_4_x-$(HostPlatform)</IntermediateOutputPath>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<NoStdLib>True</NoStdLib>
-
-
<NoConfig>True</NoConfig>
-
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>
- </RootNamespace>
<AssemblyName>System.Reactive.Linq</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
+ Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+ is a problem to compile the Mono mscorlib.dll -->
+ <PropertyGroup>
+ <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
+ <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
+ <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
+ <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>
+ </PropertyGroup>
+ <!-- @ALL_PROFILE_PROPERTIES@ -->
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
- <NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
- <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+ <!-- TRACE is set only for Debug configuration, so inherit from platform-specific value -->
+ <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugType>pdbonly</DebugType>
- <NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
- <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
- Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
- is a problem to compile the Mono mscorlib.dll -->
- <PropertyGroup>
- <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
+ <!-- @COMMON_SOURCES@ -->
+ <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
<Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\GlobalSuppressions.cs" />
<Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\InternalsVisibleTo.cs" />
<Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\NamespaceDocs.cs" />
@@ -227,57 +216,22 @@ <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\TimeInterval.cs" />
<Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Timestamped.cs" />
<Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Strings_Linq.Generated.cs" />
- <Compile Include="Assembly\AssemblyInfo.cs" />
</ItemGroup>
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <PropertyGroup>
- <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> - - </PreBuildEvent>
- <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
- </PreBuildEvent>
- <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> - - </PostBuildEvent>
- <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
- </PostBuildEvent>
- </PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="../System/System-net_4_x.csproj">
- <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
- <Name>System-net_4_x</Name>
- </ProjectReference>
- <ProjectReference Include="../System.Core/System.Core-net_4_x.csproj">
- <Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
- <Name>System.Core-net_4_x</Name>
- </ProjectReference>
- <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_x.csproj">
- <Project>{0DA7868F-C598-4E45-B33C-86FBB482DB76}</Project>
- <Name>System.Reactive.Interfaces-net_4_x</Name>
- </ProjectReference>
- <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_x.csproj">
- <Project>{52F7F1BD-9D67-494E-A53A-C291FF5424B4}</Project>
- <Name>System.Reactive.Core-net_4_x</Name>
- </ProjectReference>
- <ProjectReference Include="../corlib/corlib-net_4_x.csproj">
- <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
- <Name>corlib-net_4_x</Name>
- </ProjectReference>
+ <Compile Include="Assembly\AssemblyInfo.cs" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="Properties\" />
+ <!-- @ALL_SOURCES@ -->
+ <!-- @COMMON_PROJECT_REFERENCES@ -->
+ <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+ <ProjectReference Include="../System/System.csproj" />
+ <ProjectReference Include="../System.Core/System.Core.csproj" />
+ <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces.csproj" />
+ <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core.csproj" />
+ <ProjectReference Include="../corlib/corlib.csproj" />
</ItemGroup>
- <ItemGroup>
+ <!-- @ALL_REFERENCES@ -->
+ <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
<EmbeddedResource Include="Strings_Linq.resources.prebuilt">
<LogicalName>System.Reactive.Strings_Linq.resources</LogicalName>
</EmbeddedResource>
</ItemGroup>
-</Project>
- + <!-- @ALL_RESOURCES@ -->
+</Project>
\ No newline at end of file |