diff options
7 files changed, 212 insertions, 1 deletions
diff --git a/external/api-snapshot b/external/api-snapshot -Subproject de90d4420a03b7d5057a80967f2079336d5b4ec +Subproject a2e465f2e82381abc2b45d009e7cd5274b922e1 diff --git a/mcs/class/Facades/System.Threading.Tasks.Extensions/AssemblyInfo.cs b/mcs/class/Facades/System.Threading.Tasks.Extensions/AssemblyInfo.cs new file mode 100644 index 00000000000..81d888cec0c --- /dev/null +++ b/mcs/class/Facades/System.Threading.Tasks.Extensions/AssemblyInfo.cs @@ -0,0 +1,36 @@ +// +// Copyright (C) 2018 Microsoft Corporation +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle ("System.Threading.Tasks.Extensions")] +[assembly: AssemblyDescription ("System.Threading.Tasks.Extensions")] +[assembly: AssemblyDefaultAlias ("System.Threading.Tasks.Extensions")] +[assembly: AssemblyCompany ("Mono development team")] +[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] +[assembly: AssemblyCopyright ("(c) Various Mono authors")] +[assembly: AssemblyVersion ("4.2.0.0")] +[assembly: AssemblyInformationalVersion ("4.0.0.0")] +[assembly: AssemblyFileVersion ("4.0.0.0")] diff --git a/mcs/class/Facades/System.Threading.Tasks.Extensions/Facades_System.Threading.Tasks.Extensions.csproj b/mcs/class/Facades/System.Threading.Tasks.Extensions/Facades_System.Threading.Tasks.Extensions.csproj new file mode 100644 index 00000000000..c0cbfd950f3 --- /dev/null +++ b/mcs/class/Facades/System.Threading.Tasks.Extensions/Facades_System.Threading.Tasks.Extensions.csproj @@ -0,0 +1,110 @@ +<?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="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
+ <ProjectGuid>{872B3426-C074-4EB6-BFEB-9C42A883E23A}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <NoWarn>1699,1616,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>
+ <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+ <NoStdLib>True</NoStdLib>
+ <NoConfig>True</NoConfig>
+ <AssemblyName>System.Threading.Tasks.Extensions</AssemblyName>
+ <TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
+ <SignAssembly>true</SignAssembly>
+ <DelaySign>true</DelaySign>
+ <AssemblyOriginatorKeyFile>../../Open.snk</AssemblyOriginatorKeyFile>
+ </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>
+ <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
+ <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
+ <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;MONODROID;ANDROID</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
+ <OutputPath>./../../../class/lib/monotouch/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</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</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+ <OutputPath>./../../../class/lib/monotouch_watch/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</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;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+ <OutputPath>./../../../class/lib/monotouch_tv/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</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</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+ <OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
+ <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
+ <OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
+ <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;WIN_PLATFORM</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
+ <OutputPath>./../../../class/lib/xammac/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
+ <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'orbis' ">
+ <OutputPath>./../../../class/lib/orbis/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
+ <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;ORBIS;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'unreal' ">
+ <OutputPath>./../../../class/lib/unreal/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
+ <DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'wasm' ">
+ <OutputPath>./../../../class/lib/wasm/Facades</OutputPath>
+ <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
+ <DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;WASM;DISABLE_REMOTING;DISABLE_COM;FEATURE_NO_BSD_SOCKETS</DefineConstants>
+ </PropertyGroup>
+ <!-- @ALL_PROFILE_PROPERTIES@ -->
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <!-- TRACE is set only for Debug configuration, so inherit from platform-specific value -->
+ <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ </PropertyGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- @BUILT_SOURCES@ -->
+ <ItemGroup>
+ <Compile Include="AssemblyInfo.cs" />
+ <Compile Include="TypeForwarders.cs" />
+ </ItemGroup>
+ <ItemGroup></ItemGroup>
+ <!-- @ALL_SOURCES@ -->
+ <ItemGroup>
+ <ProjectReference Include="../../corlib/corlib.csproj" />
+ </ItemGroup>
+ <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+ <Reference Include="nunitlite">
+ <HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ </ItemGroup>
+ <!-- @ALL_REFERENCES@ -->
+ <!-- @ALL_RESOURCES@ -->
+</Project>
\ No newline at end of file diff --git a/mcs/class/Facades/System.Threading.Tasks.Extensions/Makefile b/mcs/class/Facades/System.Threading.Tasks.Extensions/Makefile new file mode 100644 index 00000000000..31446affab9 --- /dev/null +++ b/mcs/class/Facades/System.Threading.Tasks.Extensions/Makefile @@ -0,0 +1,24 @@ +MCS_BUILD_DIR = ../../../build + +thisdir = class/Facades/System.Threading.Tasks.Extensions +SUBDIRS = +include $(MCS_BUILD_DIR)/rules.make + +LIBRARY_SUBDIR = Facades +LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades + +LIBRARY = System.Threading.Tasks.Extensions.dll + +KEYFILE = ../../Open.snk +LIBRARY_SNK = $(KEYFILE) +SIGN_FLAGS = /delaysign /nowarn:1616,1699 +LIB_REFS = +LIB_MCS_FLAGS = $(SIGN_FLAGS) + +PLATFORM_DEBUG_FLAGS = + +NO_TEST = yes + +include $(MCS_BUILD_DIR)/library.make + + diff --git a/mcs/class/Facades/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.dll.sources b/mcs/class/Facades/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.dll.sources new file mode 100644 index 00000000000..5ca8e405d30 --- /dev/null +++ b/mcs/class/Facades/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.dll.sources @@ -0,0 +1,2 @@ +AssemblyInfo.cs +TypeForwarders.cs
\ No newline at end of file diff --git a/mcs/class/Facades/System.Threading.Tasks.Extensions/TypeForwarders.cs b/mcs/class/Facades/System.Threading.Tasks.Extensions/TypeForwarders.cs new file mode 100644 index 00000000000..446f4da1ddf --- /dev/null +++ b/mcs/class/Facades/System.Threading.Tasks.Extensions/TypeForwarders.cs @@ -0,0 +1,39 @@ +// +// Copyright (C) 2018 Microsoft Corporation +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter<>))] + +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask<>))] + +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource<>))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceStatus))] + diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index cd645727008..6fbe74daa20 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -90,7 +90,7 @@ unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) -mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs \ +mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs System.Threading.Tasks.Extensions \ System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Memory System.Drawing.Common mobile_only_DEPS_SUBDIRS = System.Security.Cryptography.OpenSsl |