pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

corefx-git: Backport pending patch for an elimination of PCL



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Feb 25 01:31:14 2016 +0100
Changeset:	ff591d4e5444990b2d8bb2e734e466bb1dd0e1a6

Modified Files:
	corefx-git/distinfo
Added Files:
	corefx-git/patches/patch-build.sh
	corefx-git/patches/patch-dir.props
	corefx-git/patches/patch-dir.targets
	corefx-git/patches/patch-src_Common_src_Microsoft_Internal_Assumes.InternalErrorException.cs
	corefx-git/patches/patch-src_Common_src_Microsoft_Internal_Assumes.cs
	corefx-git/patches/patch-src_Common_src_Microsoft_Internal_EmptyArray.cs
	corefx-git/patches/patch-src_Common_src_System_IO_PathInternal.cs
	corefx-git/patches/patch-src_Common_src_System_Net_ContextAwareResult.cs
	corefx-git/patches/patch-src_Common_src_System_Net_DebugCriticalHandleMinusOneIsInvalid.cs
	corefx-git/patches/patch-src_Common_src_System_Net_DebugCriticalHandleZeroOrMinusOneIsInvalid.cs
	corefx-git/patches/patch-src_Common_src_System_Net_DebugSafeHandle.cs
	corefx-git/patches/patch-src_Common_src_System_Net_DebugSafeHandleMinusOneIsInvalid.cs
	corefx-git/patches/patch-src_Common_src_System_Net_Logging_LoggingHash.cs
	corefx-git/patches/patch-src_Common_src_System_Net_NetworkInformation_HostInformationPal.NetNative.cs
	corefx-git/patches/patch-src_System.AppContext_src_System.AppContext.csproj
	corefx-git/patches/patch-src_System.Collections.Immutable_src_System.Collections.Immutable.csproj
	corefx-git/patches/patch-src_System.Collections.Immutable_src_project.json
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System.Composition.AttributedModel.csproj
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_Convention_AttributedModelProvider.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ExportAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ExportMetadataAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportManyAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportMetadataConstraintAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportingConstructorAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_MetadataAttributeAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_OnImportsSatisfiedAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_PartMetadataAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_PartNotDiscoverableAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_SharedAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_SharingBoundaryAttribute.cs
	corefx-git/patches/patch-src_System.Composition.AttributedModel_src_project.json
	corefx-git/patches/patch-src_System.Composition.Convention_src_System.Composition.Convention.csproj
	corefx-git/patches/patch-src_System.Composition.Convention_src_project.json
	corefx-git/patches/patch-src_System.Composition.Convention_tests_ExceptionAssert.cs
	corefx-git/patches/patch-src_System.Composition.Convention_tests_System.Composition.Convention.Tests.csproj
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System.Composition.Hosting.csproj
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_CompositionHost.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionDependency.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionOperation.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingExportDescriptor.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingMetadataDictionary.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_DependencyAccessor.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorPromise.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistry.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistryUpdate.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_LifetimeContext.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Constants.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_CurrentScope_CurrentScopeExportDescriptorProvider.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryExportDescriptorProvider.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryWithMetadataExportDescriptorProvider.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ImportMany_ImportManyExportDescriptorProvider.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyExportDescriptorProvider.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyWithMetadataExportDescriptorProvider.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Metadata_MetadataViewProvider.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_Formatters.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_SmallSparseInitonlyArray.cs
	corefx-git/patches/patch-src_System.Composition.Hosting_src_project.json
	corefx-git/patches/patch-src_System.Composition.Runtime_src_System.Composition.Runtime.csproj
	corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_CompositionContext.cs
	corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfT.cs
	corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfTTMetadata.cs
	corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportOfT.cs
	corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Hosting_CompositionFailedException.cs
	corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Hosting_Core_CompositionContract.cs
	corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Runtime_Util_Formatters.cs
	corefx-git/patches/patch-src_System.Composition.Runtime_src_project.json
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System.Composition.TypedParts.csproj
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_CompositionContextExtensions.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_Convention_AttributedModelProviderExtensions.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_Debugging_DiscoveredPartDebuggerProxy.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_ActivationFeature.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_DisposalFeature.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_LifetimeFeature.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_OnImportsSatisfiedFeature.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_PropertyInjectionFeature.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ContractHelpers.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredExport.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredInstanceExport.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPart.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPropertyExport.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_TypeInspector.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_TypedPartExportDescriptorProvider.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Util_DirectAttributeContext.cs
	corefx-git/patches/patch-src_System.Composition.TypedParts_src_project.json
	corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_KeyByMetadataAttribute.cs
	corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_Microsoft.Composition.Demos.ExtendedCollectionImports.csproj
	corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_project.json
	corefx-git/patches/patch-src_System.Composition_perftests_Microsoft.Composition.ThroughputHarness.csproj
	corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_TestClass.cs
	corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_TestLibrary.csproj
	corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_project.json
	corefx-git/patches/patch-src_System.Composition_tests_System.Composition.Tests.csproj
	corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_ActivityTracker.cs
	corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSource.cs
	corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSourceException.cs
	corefx-git/patches/patch-src_System.IO.FileSystem_src_System.IO.FileSystem.csproj
	corefx-git/patches/patch-src_System.IO.FileSystem_src_System_IO_WinRTFileSystem.cs
	corefx-git/patches/patch-src_System.IO.IsolatedStorage_src_System.IO.IsolatedStorage.csproj
	corefx-git/patches/patch-src_System.Net.Http_src_System.Net.Http.csproj
	corefx-git/patches/patch-src_System.Net.NameResolution_System.Net.NameResolution.sln
	corefx-git/patches/patch-src_System.Net.NetworkInformation_src_System.Net.NetworkInformation.csproj
	corefx-git/patches/patch-src_System.Net.Primitives_src_System.Net.Primitives.csproj
	corefx-git/patches/patch-src_System.Net.Primitives_src_System_Net_CookieException.cs
	corefx-git/patches/patch-src_System.Net.Primitives_src_System_Net_SecureProtocols_SslEnumTypes.cs
	corefx-git/patches/patch-src_System.Net.Requests_src_System_Net_WebResponse.cs
	corefx-git/patches/patch-src_System.Net.Sockets_System.Net.Sockets.sln
	corefx-git/patches/patch-src_System.Net.Sockets_src_System_Net_Sockets_UDPClient.cs
	corefx-git/patches/patch-src_System.Net.Sockets_src_System_Net_Sockets_UdpReceiveResult.cs
	corefx-git/patches/patch-src_System.Net.WebSockets.Client_src_System.Net.WebSockets.Client.csproj
	corefx-git/patches/patch-src_System.Runtime.Extensions_src_System.Runtime.Extensions.csproj
	corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_ref_project.json
	corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_src_System.Runtime.WindowsRuntime.csproj
	corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_src_project.json
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Create.cs
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Delete.cs
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Exists.cs
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Export.cs
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Import.cs
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Open.cs
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.OpenHandle.cs
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Properties.cs
	corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.StandardProperties.cs
	corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_Internal_TargetCore.cs
	corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.WP8.csproj
	corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.csproj
	corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_project.json
	corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_wp8_project.json
	corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_tests_System.Threading.Tasks.Dataflow.Tests.csproj
	corefx-git/patches/patch-src_mscorlib.WinRT-Facade_TypeForwards.cs
	corefx-git/patches/patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.builds
	corefx-git/patches/patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.csproj
	corefx-git/patches/patch-src_mscorlib.WinRT-Facade_project.json

Log Message:
corefx-git: Backport pending patch for an elimination of PCL

Patch ID:

>From 67a17b3d51432c79d844f0cff40f6ef9a41ae22c Mon Sep 17 00:00:00 2001
From: Eric Mellino <erme%microsoft.com@localhost>
Date: Thu, 4 Feb 2016 16:26:11 -0800
Subject: [PATCH 1/6] Eliminate PCL Profile warning messages

https://github.com/dotnet/corefx/pull/6077

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ff591d4e5444990b2d8bb2e734e466bb1dd0e1a6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 corefx-git/distinfo                                | 133 +++++++++++++++++++++
 corefx-git/patches/patch-build.sh                  |  33 +++++
 corefx-git/patches/patch-dir.props                 |  19 +++
 corefx-git/patches/patch-dir.targets               |  18 +++
 ...soft_Internal_Assumes.InternalErrorException.cs |  12 ++
 ...ch-src_Common_src_Microsoft_Internal_Assumes.cs |  14 +++
 ...src_Common_src_Microsoft_Internal_EmptyArray.cs |  19 +++
 .../patch-src_Common_src_System_IO_PathInternal.cs |  13 ++
 ...src_Common_src_System_Net_ContextAwareResult.cs |  12 ++
 ...tem_Net_DebugCriticalHandleMinusOneIsInvalid.cs |  18 +++
 ...t_DebugCriticalHandleZeroOrMinusOneIsInvalid.cs |  18 +++
 ...ch-src_Common_src_System_Net_DebugSafeHandle.cs |  12 ++
 ..._System_Net_DebugSafeHandleMinusOneIsInvalid.cs |  12 ++
 ...rc_Common_src_System_Net_Logging_LoggingHash.cs |  12 ++
 ...workInformation_HostInformationPal.NetNative.cs |  23 ++++
 ..._System.AppContext_src_System.AppContext.csproj |  12 ++
 ...mutable_src_System.Collections.Immutable.csproj |  13 ++
 ...c_System.Collections.Immutable_src_project.json |  22 ++++
 ...l_src_System.Composition.AttributedModel.csproj |  43 +++++++
 ...mposition_Convention_AttributedModelProvider.cs |  17 +++
 ...Model_src_System_Composition_ExportAttribute.cs |  12 ++
 ...c_System_Composition_ExportMetadataAttribute.cs |  13 ++
 ...Model_src_System_Composition_ImportAttribute.cs |  12 ++
 ...l_src_System_Composition_ImportManyAttribute.cs |  12 ++
 ...omposition_ImportMetadataConstraintAttribute.cs |  16 +++
 ...em_Composition_ImportingConstructorAttribute.cs |  14 +++
 ...ystem_Composition_MetadataAttributeAttribute.cs |  13 ++
 ...stem_Composition_OnImportsSatisfiedAttribute.cs |  13 ++
 ...src_System_Composition_PartMetadataAttribute.cs |  13 ++
 ...tem_Composition_PartNotDiscoverableAttribute.cs |  13 ++
 ...Model_src_System_Composition_SharedAttribute.cs |  16 +++
 ..._System_Composition_SharingBoundaryAttribute.cs |  12 ++
 ...em.Composition.AttributedModel_src_project.json |  18 +++
 ...ention_src_System.Composition.Convention.csproj |  46 +++++++
 ..._System.Composition.Convention_src_project.json |  24 ++++
 ...Composition.Convention_tests_ExceptionAssert.cs |  14 +++
 ...ests_System.Composition.Convention.Tests.csproj |  42 +++++++
 ...n.Hosting_src_System.Composition.Hosting.csproj |  41 +++++++
 ...c_System_Composition_Hosting_CompositionHost.cs |  13 ++
 ...mposition_Hosting_Core_CompositionDependency.cs |  12 ++
 ...omposition_Hosting_Core_CompositionOperation.cs |  12 ++
 ...n_Hosting_Core_CycleBreakingExportDescriptor.cs |  12 ++
 ...Hosting_Core_CycleBreakingMetadataDictionary.cs |  12 ++
 ..._Composition_Hosting_Core_DependencyAccessor.cs |  12 ++
 ...osition_Hosting_Core_ExportDescriptorPromise.cs |  15 +++
 ...sition_Hosting_Core_ExportDescriptorRegistry.cs |  12 ++
 ..._Hosting_Core_ExportDescriptorRegistryUpdate.cs |  16 +++
 ...tem_Composition_Hosting_Core_LifetimeContext.cs |  15 +++
 ...stem_Composition_Hosting_Providers_Constants.cs |  17 +++
 ...ntScope_CurrentScopeExportDescriptorProvider.cs |  12 ++
 ...actory_ExportFactoryExportDescriptorProvider.cs |  15 +++
 ...tFactoryWithMetadataExportDescriptorProvider.cs |  17 +++
 ...mportMany_ImportManyExportDescriptorProvider.cs |  15 +++
 ..._Providers_Lazy_LazyExportDescriptorProvider.cs |  15 +++
 ...azy_LazyWithMetadataExportDescriptorProvider.cs |  14 +++
 ...ting_Providers_Metadata_MetadataViewProvider.cs |  21 ++++
 ...c_System_Composition_Hosting_Util_Formatters.cs |  15 +++
 ...sition_Hosting_Util_SmallSparseInitonlyArray.cs |  13 ++
 ...src_System.Composition.Hosting_src_project.json |  25 ++++
 ...n.Runtime_src_System.Composition.Runtime.csproj |  42 +++++++
 ...me_src_System_Composition_CompositionContext.cs |  13 ++
 ...time_src_System_Composition_ExportFactoryOfT.cs |  13 ++
 ...System_Composition_ExportFactoryOfTTMetadata.cs |  13 ++
 ...ion.Runtime_src_System_Composition_ExportOfT.cs |  14 +++
 ...mposition_Hosting_CompositionFailedException.cs |  13 ++
 ...Composition_Hosting_Core_CompositionContract.cs |  12 ++
 ...c_System_Composition_Runtime_Util_Formatters.cs |  16 +++
 ...src_System.Composition.Runtime_src_project.json |  20 ++++
 ...dParts_src_System.Composition.TypedParts.csproj |  42 +++++++
 ...tem_Composition_CompositionContextExtensions.cs |  12 ++
 ...Convention_AttributedModelProviderExtensions.cs |  18 +++
 ...sition_Debugging_DiscoveredPartDebuggerProxy.cs |  12 ++
 ...edParts_ActivationFeatures_ActivationFeature.cs |  12 ++
 ...ypedParts_ActivationFeatures_DisposalFeature.cs |  12 ++
 ...ypedParts_ActivationFeatures_LifetimeFeature.cs |  12 ++
 ...ActivationFeatures_OnImportsSatisfiedFeature.cs |  17 +++
 ..._ActivationFeatures_PropertyInjectionFeature.cs |  12 ++
 ...ystem_Composition_TypedParts_ContractHelpers.cs |  17 +++
 ...sition_TypedParts_Discovery_DiscoveredExport.cs |  17 +++
 ...ypedParts_Discovery_DiscoveredInstanceExport.cs |  12 ++
 ...position_TypedParts_Discovery_DiscoveredPart.cs |  20 ++++
 ...ypedParts_Discovery_DiscoveredPropertyExport.cs |  16 +++
 ...mposition_TypedParts_Discovery_TypeInspector.cs |  17 +++
 ...TypedParts_TypedPartExportDescriptorProvider.cs |  16 +++
 ...ition_TypedParts_Util_DirectAttributeContext.cs |  12 ++
 ..._System.Composition.TypedParts_src_project.json |  23 ++++
 ...ndedCollectionImports_KeyByMetadataAttribute.cs |  12 ++
 ...position.Demos.ExtendedCollectionImports.csproj |  46 +++++++
 ...on.Demos.ExtendedCollectionImports_project.json |  16 +++
 ..._Microsoft.Composition.ThroughputHarness.csproj |  42 +++++++
 ....Composition_scenarios_TestLibrary_TestClass.cs |  16 +++
 ...sition_scenarios_TestLibrary_TestLibrary.csproj |  43 +++++++
 ....Composition_scenarios_TestLibrary_project.json |  14 +++
 ...mposition_tests_System.Composition.Tests.csproj |  51 ++++++++
 ...c_System_Diagnostics_Tracing_ActivityTracker.cs |  12 ++
 ...g_src_System_Diagnostics_Tracing_EventSource.cs |  13 ++
 ...tem_Diagnostics_Tracing_EventSourceException.cs |  14 +++
 ...m.IO.FileSystem_src_System.IO.FileSystem.csproj |  14 +++
 ....IO.FileSystem_src_System_IO_WinRTFileSystem.cs |  13 ++
 ...tedStorage_src_System.IO.IsolatedStorage.csproj |  12 ++
 ...-src_System.Net.Http_src_System.Net.Http.csproj |  12 ++
 ...et.NameResolution_System.Net.NameResolution.sln |  73 +++++++++++
 ...mation_src_System.Net.NetworkInformation.csproj |  14 +++
 ...Net.Primitives_src_System.Net.Primitives.csproj |  15 +++
 ...et.Primitives_src_System_Net_CookieException.cs |  13 ++
 ..._src_System_Net_SecureProtocols_SslEnumTypes.cs |  12 ++
 ...stem.Net.Requests_src_System_Net_WebResponse.cs |  13 ++
 ...h-src_System.Net.Sockets_System.Net.Sockets.sln |  75 ++++++++++++
 ...Net.Sockets_src_System_Net_Sockets_UDPClient.cs |  14 +++
 ...kets_src_System_Net_Sockets_UdpReceiveResult.cs |  13 ++
 ....Client_src_System.Net.WebSockets.Client.csproj |  15 +++
 ...Extensions_src_System.Runtime.Extensions.csproj |  12 ++
 ..._System.Runtime.WindowsRuntime_ref_project.json |  11 ++
 ...untime_src_System.Runtime.WindowsRuntime.csproj |  12 ++
 ..._System.Runtime.WindowsRuntime_src_project.json |  30 +++++
 ...c_System_Security_Cryptography_CngKey.Create.cs |  15 +++
 ...c_System_Security_Cryptography_CngKey.Delete.cs |  17 +++
 ...c_System_Security_Cryptography_CngKey.Exists.cs |  15 +++
 ...c_System_Security_Cryptography_CngKey.Export.cs |  17 +++
 ...c_System_Security_Cryptography_CngKey.Import.cs |  15 +++
 ...src_System_Security_Cryptography_CngKey.Open.cs |  15 +++
 ...stem_Security_Cryptography_CngKey.OpenHandle.cs |  21 ++++
 ...stem_Security_Cryptography_CngKey.Properties.cs |  17 +++
 ...urity_Cryptography_CngKey.StandardProperties.cs |  14 +++
 ...ading.Tasks.Dataflow_src_Internal_TargetCore.cs |  18 +++
 ..._src_System.Threading.Tasks.Dataflow.WP8.csproj |  31 +++++
 ...flow_src_System.Threading.Tasks.Dataflow.csproj |  43 +++++++
 ...ystem.Threading.Tasks.Dataflow_src_project.json |  27 +++++
 ...m.Threading.Tasks.Dataflow_src_wp8_project.json |  25 ++++
 ...ts_System.Threading.Tasks.Dataflow.Tests.csproj |  27 +++++
 ...patch-src_mscorlib.WinRT-Facade_TypeForwards.cs |  38 ++++++
 ...orlib.WinRT-Facade_mscorlib.WinRT-Facade.builds |  14 +++
 ...orlib.WinRT-Facade_mscorlib.WinRT-Facade.csproj |  23 ++++
 .../patch-src_mscorlib.WinRT-Facade_project.json   |  15 +++
 134 files changed, 2643 insertions(+)

diffs:
diff --git a/corefx-git/distinfo b/corefx-git/distinfo
index c641c55..446f024 100644
--- a/corefx-git/distinfo
+++ b/corefx-git/distinfo
@@ -1 +1,134 @@
 $NetBSD$
+SHA1 (patch-build.sh) = 901b7e7d2c9df0669ab9a6fc7468df00a01b933d
+SHA1 (patch-dir.props) = ffb72c61758277effcd780ed97b4d7ff0eb772a9
+SHA1 (patch-dir.targets) = 7a98782e8592716c0ac0a6bd23b3fac7d357daff
+SHA1 (patch-src_Common_src_Microsoft_Internal_Assumes.InternalErrorException.cs) = aa2811c5f3159835c159928b8267097a3de0edeb
+SHA1 (patch-src_Common_src_Microsoft_Internal_Assumes.cs) = 661232e52bafecb8c9e56368f529830ec56e9184
+SHA1 (patch-src_Common_src_Microsoft_Internal_EmptyArray.cs) = c1ebb882bc85d53f9abfe61db1470634467bf1f2
+SHA1 (patch-src_Common_src_System_IO_PathInternal.cs) = 5a0c74ebea3fceeb5594dce86f8f95e52942954e
+SHA1 (patch-src_Common_src_System_Net_ContextAwareResult.cs) = 6b147e6295a2a7ea9703799d67559af5d6bd5bb3
+SHA1 (patch-src_Common_src_System_Net_DebugCriticalHandleMinusOneIsInvalid.cs) = 0c1bfeb16465e85e558549601420d5334cee250b
+SHA1 (patch-src_Common_src_System_Net_DebugCriticalHandleZeroOrMinusOneIsInvalid.cs) = a30091893d11316329ceff2eedd1cc884394eb50
+SHA1 (patch-src_Common_src_System_Net_DebugSafeHandle.cs) = abff103e5e043811dabdb4684964f286cbb83c03
+SHA1 (patch-src_Common_src_System_Net_DebugSafeHandleMinusOneIsInvalid.cs) = 5ef2809870a30f37efa3c83be8bea7514fef6f60
+SHA1 (patch-src_Common_src_System_Net_Logging_LoggingHash.cs) = 8ab08ff98d210142ce32aa7fa496c731fc923967
+SHA1 (patch-src_Common_src_System_Net_NetworkInformation_HostInformationPal.NetNative.cs) = 3577266574d8f920d9087480afc5c5c78dd87b29
+SHA1 (patch-src_System.AppContext_src_System.AppContext.csproj) = e65a3bdb9da50f2cb6a410a4951347c1297f65e0
+SHA1 (patch-src_System.Collections.Immutable_src_System.Collections.Immutable.csproj) = a4c1ec4587ca4d15fd57361c9e4216b7b80e2e27
+SHA1 (patch-src_System.Collections.Immutable_src_project.json) = 26ecb0e0afa373bc20ae05364275bae2b6c0ee61
+SHA1 (patch-src_System.Composition.AttributedModel_src_System.Composition.AttributedModel.csproj) = 59a35544578ccfec4b492c070b08ef7ae3e4c72a
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_Convention_AttributedModelProvider.cs) = 014ae3edb1ee6d095539fbc16fa6a468ff25dabf
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_ExportAttribute.cs) = 472ef192ba4e4491fe1b958918ca76540ce6e3ee
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_ExportMetadataAttribute.cs) = 288e9874b08d116888e6bcbb450641276668325a
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_ImportAttribute.cs) = 510903f949025a9dcb0cbb9522fdc9d9b73adebc
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_ImportManyAttribute.cs) = acf392a40da14eb93f462c51297b4b1d6f7c2e7d
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_ImportMetadataConstraintAttribute.cs) = 2f90d573744512d550b7f1a9bb7b970e5fa2e4dd
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_ImportingConstructorAttribute.cs) = 7994f751ef1e2274a034a7d24c3e680babc1bd29
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_MetadataAttributeAttribute.cs) = 648432be8ca2534d790280ac2381be62948216a5
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_OnImportsSatisfiedAttribute.cs) = 3d1efef309abcc459a6ccddf293ef5d425bf6dd0
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_PartMetadataAttribute.cs) = bf2a100b0974ab0da4dcde81e7a92815ad0ab822
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_PartNotDiscoverableAttribute.cs) = a600e146e3ae7acd470a2e03c9e785a30952bfa9
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_SharedAttribute.cs) = 77644d63e1c29ccd813a901085a6c630cfb203c3
+SHA1 (patch-src_System.Composition.AttributedModel_src_System_Composition_SharingBoundaryAttribute.cs) = 0d8734c558bd0ddf625bbcbbd46d0ea2d61f9026
+SHA1 (patch-src_System.Composition.AttributedModel_src_project.json) = 193fa6c345b5cf02d1208a9544bb1a0ac9664d08
+SHA1 (patch-src_System.Composition.Convention_src_System.Composition.Convention.csproj) = 03c18b6d9e12f0c1e5a92d8ae111953d1365a626
+SHA1 (patch-src_System.Composition.Convention_src_project.json) = 72b867177a16fb7a292b448e1032c99152af23d1
+SHA1 (patch-src_System.Composition.Convention_tests_ExceptionAssert.cs) = 00e9f7e3a7d8282eba5e911315b373b3fb2063a5
+SHA1 (patch-src_System.Composition.Convention_tests_System.Composition.Convention.Tests.csproj) = b7e968aa1e4d54930e0115a4a86d42edd3716e8f
+SHA1 (patch-src_System.Composition.Hosting_src_System.Composition.Hosting.csproj) = 6711bc433510eec83d1a1488a4bf480e17e6e777
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_CompositionHost.cs) = f4824c0e8e3eed0a1af6c4b7819f085341f73ab9
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionDependency.cs) = 6b08fc4c6921f30374b0c751ffe34658fcb52913
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionOperation.cs) = a71a18652b1ef64b1dc9bd11ef63b59df54cb514
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingExportDescriptor.cs) = c2e289feaff1031cbebc3baafd49d3912180815c
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingMetadataDictionary.cs) = 05e96e7d6f3d4d92c64d9e2ac05773022ebd9586
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_DependencyAccessor.cs) = a747b35e648cff0c0b6c8c746835a31aa70a8682
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorPromise.cs) = 8b75b82b5465fd0a35bab8b99d81f34a6d7255bf
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistry.cs) = 8fd91e0fcaf02d39cbed3d11829c720b12e23c1a
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistryUpdate.cs) = 8b041c87526e4a6c8335df72cad3238cdc13878a
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_LifetimeContext.cs) = fbd525afd48a747b88841f86d31572f617903de9
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Constants.cs) = f16622bcd59875a4af82062d6bb834836fbecde9
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_CurrentScope_CurrentScopeExportDescriptorProvider.cs) = 40703f80c9ccbd272f1d950a4acb33ea46a94066
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryExportDescriptorProvider.cs) = b5c882f395f6f58309b2bcfa2f4fe3c8019eb2d9
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryWithMetadataExportDescriptorProvider.cs) = f329302ae7a4ea1e1a2df0d5dbd7a8f2715fa4b3
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ImportMany_ImportManyExportDescriptorProvider.cs) = a9f1125fb2a5fddc93413c6efad8ef94931ad62f
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyExportDescriptorProvider.cs) = aedcd9703375993bbc56501fecedc7f12f787f13
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyWithMetadataExportDescriptorProvider.cs) = e75d46c1c41b8c3f25704b37073b6257655532eb
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Metadata_MetadataViewProvider.cs) = c0535dbf23c7c918f7486886eda8027be9b1c6ee
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_Formatters.cs) = 4916624810564739432882acb0c0ed6ce8d4313a
+SHA1 (patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_SmallSparseInitonlyArray.cs) = 69d1476f889d33a4ca96e192eeb2bb507eb74e50
+SHA1 (patch-src_System.Composition.Hosting_src_project.json) = 0bea2c1261933b46c576ff7fbd0ea3f7509f74ea
+SHA1 (patch-src_System.Composition.Runtime_src_System.Composition.Runtime.csproj) = 9d33652d1294e582c50534facce4e79065462864
+SHA1 (patch-src_System.Composition.Runtime_src_System_Composition_CompositionContext.cs) = b6e80eeeaba7be54d8a0ffa52810cbdb9d9a806a
+SHA1 (patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfT.cs) = fff5c18942042ab4d650387601273947e7a8d575
+SHA1 (patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfTTMetadata.cs) = 0f22a166081d236ef7d4ba9eacffce121e40fe67
+SHA1 (patch-src_System.Composition.Runtime_src_System_Composition_ExportOfT.cs) = 38bd0e4606bbee02c012f2f5c2422be28946cc41
+SHA1 (patch-src_System.Composition.Runtime_src_System_Composition_Hosting_CompositionFailedException.cs) = bc6573244782414da821b63ebacdafc9ac93710f
+SHA1 (patch-src_System.Composition.Runtime_src_System_Composition_Hosting_Core_CompositionContract.cs) = a08f6c50bd6e99a06b1eabb81f8102b651236acd
+SHA1 (patch-src_System.Composition.Runtime_src_System_Composition_Runtime_Util_Formatters.cs) = 0ac73f45d554e92157d07c9b7e966bddc4fd376b
+SHA1 (patch-src_System.Composition.Runtime_src_project.json) = e209ec5e67c55523ae990033959f78997ed23d09
+SHA1 (patch-src_System.Composition.TypedParts_src_System.Composition.TypedParts.csproj) = 856639857076500f5d4e673fd6907b0f6f52827f
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_CompositionContextExtensions.cs) = bafe6bdb1c7ab3ceaf7734e19b4876567d13999e
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_Convention_AttributedModelProviderExtensions.cs) = 244f0634ceeb3ad54bad1d93d5ce41bd78bae8f8
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_Debugging_DiscoveredPartDebuggerProxy.cs) = bc06fde6f9220636a92e17cba3b63b4775a64de2
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_ActivationFeature.cs) = 1be86e7e256f90bbb6dd4da1a70b77166d4b5cc5
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_DisposalFeature.cs) = 3e476bb1a4f429ece3cebe92effe35958df3adf4
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_LifetimeFeature.cs) = 12f2c8df09b7c2c28f29d4a6b3762cb0b3ef6528
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_OnImportsSatisfiedFeature.cs) = 49f02417fbeb0d38406f26781d29267f3e728b0a
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_PropertyInjectionFeature.cs) = 93c586990cdab42e55a1411a36ba43e862f24ea6
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ContractHelpers.cs) = 2ce4ef4aed8053bc1b216c1f28eee1dfca5f1676
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredExport.cs) = fc8926716ec4e6cdccfa344bcb9ba4820261fbbd
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredInstanceExport.cs) = 738102d7525b5151a7e5b3e46887e2e9aca7ee07
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPart.cs) = d7016a22e6348bbc89e6515a6b28e41f2d2c9f80
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPropertyExport.cs) = 9452d3b79a4aa812f91cdf29f8bc85525f96e56a
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_TypeInspector.cs) = a50253e2dd509c32fe6e4a602028515dad08be0e
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_TypedPartExportDescriptorProvider.cs) = 4bdcd91613310250362cca69ab53ea42d8bf79b8
+SHA1 (patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Util_DirectAttributeContext.cs) = 08c40c6ab59850cdb9f158bbfa05f243924048b0
+SHA1 (patch-src_System.Composition.TypedParts_src_project.json) = 4fd2d9bdd1283386c3b0389239308b18fd943e20
+SHA1 (patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_KeyByMetadataAttribute.cs) = 436aa4bda0c63748a2a3d8ce456b0d795c977cc7
+SHA1 (patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_Microsoft.Composition.Demos.ExtendedCollectionImports.csproj) = b93570b43762d70cfd8ca3822331eec02c4521e4
+SHA1 (patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_project.json) = 9c5f9be1c16b7f6dcf6e4389f7ef9b15348399d1
+SHA1 (patch-src_System.Composition_perftests_Microsoft.Composition.ThroughputHarness.csproj) = a3a2a825479585269d117f1ceb6be2731be789c7
+SHA1 (patch-src_System.Composition_scenarios_TestLibrary_TestClass.cs) = 7fc7e9c21fd9fd0b7d1d6a00f71e22f7353c31bf
+SHA1 (patch-src_System.Composition_scenarios_TestLibrary_TestLibrary.csproj) = 9f45ff9e6a904e626940d1810d3ff924884d620e
+SHA1 (patch-src_System.Composition_scenarios_TestLibrary_project.json) = 8ab5da1efab1f96dfcbcdcd1d72e631cd8608341
+SHA1 (patch-src_System.Composition_tests_System.Composition.Tests.csproj) = 4630c4a45f53de03101c4863558f17705b4dba34
+SHA1 (patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_ActivityTracker.cs) = cbe882831a908741ec6a0324da1febde31aa6967
+SHA1 (patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSource.cs) = 4b344f948731ca4e1bd403f488a1459e1604f433
+SHA1 (patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSourceException.cs) = aadbf3b682516a4a1593158d5f3b8f116a705ee2
+SHA1 (patch-src_System.IO.FileSystem_src_System.IO.FileSystem.csproj) = bbd8434967dab875cd49706f76ddea68a0710b3f
+SHA1 (patch-src_System.IO.FileSystem_src_System_IO_WinRTFileSystem.cs) = 8bc835a5f3b6b8be5c6011d41841fa2a39cde658
+SHA1 (patch-src_System.IO.IsolatedStorage_src_System.IO.IsolatedStorage.csproj) = e7a10eb3692494e8b48661d9094eaf01d9c5da83
+SHA1 (patch-src_System.Net.Http_src_System.Net.Http.csproj) = b5b1ef24346a1be7ffd2979fbccd0366d5a5af9c
+SHA1 (patch-src_System.Net.NameResolution_System.Net.NameResolution.sln) = d719248127af755712ba01cf0f0bfa109babf5ef
+SHA1 (patch-src_System.Net.NetworkInformation_src_System.Net.NetworkInformation.csproj) = 1c61de35cf0d7a8042bfc29c04c54cd0269ea774
+SHA1 (patch-src_System.Net.Primitives_src_System.Net.Primitives.csproj) = 164523cf2b4d6e360cec036bbe43ba88aa365f01
+SHA1 (patch-src_System.Net.Primitives_src_System_Net_CookieException.cs) = 861f2f35dcfe8c4f2fb6309dd6b11027417a7ea3
+SHA1 (patch-src_System.Net.Primitives_src_System_Net_SecureProtocols_SslEnumTypes.cs) = e1e14f01a539fdc3cb8fff1d9db0ee0b05f97db6
+SHA1 (patch-src_System.Net.Requests_src_System_Net_WebResponse.cs) = 111c7dabc44ab01f1026aaa102cd75c345647543
+SHA1 (patch-src_System.Net.Sockets_System.Net.Sockets.sln) = 29d58f7960221ef50be52e8556de51d02dac4308
+SHA1 (patch-src_System.Net.Sockets_src_System_Net_Sockets_UDPClient.cs) = 301a495c8c4c40a11589a8e60ceb19e9c27f4d2b
+SHA1 (patch-src_System.Net.Sockets_src_System_Net_Sockets_UdpReceiveResult.cs) = 73ea0dd21c9654f71162168b4ec7e0cacddbbc83
+SHA1 (patch-src_System.Net.WebSockets.Client_src_System.Net.WebSockets.Client.csproj) = a238d15eb5e0ce5f608320b3e34ea32fb5047270
+SHA1 (patch-src_System.Runtime.Extensions_src_System.Runtime.Extensions.csproj) = 9d0d47802135a292cfb61fec03ae9c4a8e2b7054
+SHA1 (patch-src_System.Runtime.WindowsRuntime_ref_project.json) = 889175d07747a84ce020986a26b8ba87c1c2136a
+SHA1 (patch-src_System.Runtime.WindowsRuntime_src_System.Runtime.WindowsRuntime.csproj) = 8318b9470a4736b5256354379081cd518ce7b03e
+SHA1 (patch-src_System.Runtime.WindowsRuntime_src_project.json) = f60481eaa51b53637dda8371f3926225a6e1c57a
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Create.cs) = 9abac22f2204b87e5902c7a379c92add992cae03
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Delete.cs) = bbc6f3cb05b6c9432363ab8997bba4e87ce08610
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Exists.cs) = 2e1d3bf8aee2fae6a54af5a528a561b7ef0bcad6
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Export.cs) = f8786dfee16ede7f82822a2d7f1faf3a031a6195
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Import.cs) = 4f0e4ba7c7f9e47761fdc5bbae294daeb1050304
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Open.cs) = 712fe7e0d1919a06fd105207e8d0f716e7a491d2
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.OpenHandle.cs) = ee485dc928f7f99f297dbb5e55ebb7abd6e8a2d3
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Properties.cs) = cbc18654fa07c0d1edb557539645cb9489f6d4a6
+SHA1 (patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.StandardProperties.cs) = 37a13b2527598823df8448f0cb1d0a440bf00265
+SHA1 (patch-src_System.Threading.Tasks.Dataflow_src_Internal_TargetCore.cs) = 975a64b08480c6c3a704cd2a3dd8ce0a3de476d0
+SHA1 (patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.WP8.csproj) = 47209a13da5d26db2ff9f8bbe34cf9a2ff4fe3be
+SHA1 (patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.csproj) = bbfb5bcc9e8b8b7b7b02804ada7835c269d9fa0b
+SHA1 (patch-src_System.Threading.Tasks.Dataflow_src_project.json) = dd5780b9462aacd533549a45a437a8001b7dfaa3
+SHA1 (patch-src_System.Threading.Tasks.Dataflow_src_wp8_project.json) = 838482bd85c9721f5e45c94455a000899d3e43da
+SHA1 (patch-src_System.Threading.Tasks.Dataflow_tests_System.Threading.Tasks.Dataflow.Tests.csproj) = 4e052684064a465584415d430ff00674ca4e86f0
+SHA1 (patch-src_mscorlib.WinRT-Facade_TypeForwards.cs) = bd935fc8b809744118517969258e3503279ff325
+SHA1 (patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.builds) = ad77a71bb3cfc8193b57f99badfc4a436f0f3de8
+SHA1 (patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.csproj) = d1948ab525ea6683e7def558a08dac85e970d4e6
+SHA1 (patch-src_mscorlib.WinRT-Facade_project.json) = 6a1047609c9558fedf517c37cb9cb2e17554caa3
diff --git a/corefx-git/patches/patch-build.sh b/corefx-git/patches/patch-build.sh
new file mode 100644
index 0000000..b7a5f8d
--- /dev/null
+++ b/corefx-git/patches/patch-build.sh
@@ -0,0 +1,33 @@
+$NetBSD$
+
+--- build.sh.orig	2016-02-25 00:30:19.839282245 +0000
++++ build.sh
+@@ -103,7 +103,7 @@ build_managed_corefx()
+     __binclashlog=$__scriptpath/binclash.log
+     __binclashloggerdll=$__scriptpath/Tools/Microsoft.DotNet.Build.Tasks.dll
+ 
+-    ReferenceAssemblyRoot=$__referenceassemblyroot $__scriptpath/Tools/corerun $__scriptpath/Tools/MSBuild.exe "$__buildproj" /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" "/l:BinClashLogger,$__binclashloggerdll;LogFile=$__binclashlog" /t:Build /p:OSGroup=$__BuildOS /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:TestNugetRuntimeId=$__TestNugetRuntimeId $__UnprocessedBuildArgs
++    $__scriptpath/Tools/corerun $__scriptpath/Tools/MSBuild.exe "$__buildproj" /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:OSGroup=$__BuildOS /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:TestNugetRuntimeId=$__TestNugetRuntimeId $__UnprocessedBuildArgs
+     BUILDERRORLEVEL=$?
+ 
+     echo
+@@ -247,19 +247,6 @@ __BuildOS=$__HostOS
+ __BuildType=Debug
+ __CMakeArgs=DEBUG
+ 
+-case $__HostOS in
+-    FreeBSD)
+-        __monoroot=/usr/local
+-        ;;
+-    OSX)
+-        __monoroot=/Library/Frameworks/Mono.framework/Versions/Current
+-        ;;
+-    *)
+-        __monoroot=/usr
+-        ;;
+-esac
+-
+-__referenceassemblyroot=$__monoroot/lib/mono/xbuild-frameworks
+ BUILDERRORLEVEL=0
+ 
+ # Set the various build properties here so that CMake and MSBuild can pick them up
diff --git a/corefx-git/patches/patch-dir.props b/corefx-git/patches/patch-dir.props
new file mode 100644
index 0000000..ba5a48a
--- /dev/null
+++ b/corefx-git/patches/patch-dir.props
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- dir.props.orig	2016-02-25 00:30:19.839450115 +0000
++++ dir.props
+@@ -403,4 +403,14 @@
+ 
+   <Import Project="$(RoslynPropsFile)" Condition="'$(OsEnvironment)'=='Unix' and Exists('$(RoslynPropsFile)')" />
+ 
++  <PropertyGroup>
++    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
++         the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
++    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
++    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
++    <TargetFrameworkProfile></TargetFrameworkProfile>
++    <IgnoreDefaultInstalledAssemblyTables>true</IgnoreDefaultInstalledAssemblyTables>
++    <PortableNuGetMode>true</PortableNuGetMode>
++  </PropertyGroup>
++
+ </Project>
diff --git a/corefx-git/patches/patch-dir.targets b/corefx-git/patches/patch-dir.targets
new file mode 100644
index 0000000..7e2d8a7
--- /dev/null
+++ b/corefx-git/patches/patch-dir.targets
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- dir.targets.orig	2016-01-30 00:20:59.000000000 +0000
++++ dir.targets
+@@ -15,4 +15,13 @@
+ 
+   <Import Project="$(ToolsDir)/Build.Common.targets" />
+ 
++  <PropertyGroup>
++    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip
++         the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). -->
++    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
++    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
++    <TargetFrameworkProfile></TargetFrameworkProfile>
++    <IgnoreDefaultInstalledAssemblyTables>true</IgnoreDefaultInstalledAssemblyTables>
++  </PropertyGroup>
++
+ </Project>
diff --git a/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_Assumes.InternalErrorException.cs b/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_Assumes.InternalErrorException.cs
new file mode 100644
index 0000000..544b17d
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_Assumes.InternalErrorException.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/Common/src/Microsoft/Internal/Assumes.InternalErrorException.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/Microsoft/Internal/Assumes.InternalErrorException.cs
+@@ -5,7 +5,6 @@
+ using System;
+ using System.Diagnostics.CodeAnalysis;
+ using System.Globalization;
+-using System.Runtime.Serialization;
+ 
+ namespace Microsoft.Internal
+ {
diff --git a/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_Assumes.cs b/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_Assumes.cs
new file mode 100644
index 0000000..a04a8cc
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_Assumes.cs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/Common/src/Microsoft/Internal/Assumes.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/Microsoft/Internal/Assumes.cs
+@@ -4,9 +4,6 @@
+ 
+ using System;
+ using System.Diagnostics;
+-using System.Diagnostics.CodeAnalysis;
+-using System.Globalization;
+-using System.Runtime.Serialization;
+ 
+ namespace Microsoft.Internal
+ {
diff --git a/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_EmptyArray.cs b/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_EmptyArray.cs
new file mode 100644
index 0000000..0503be4
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_Microsoft_Internal_EmptyArray.cs
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- src/Common/src/Microsoft/Internal/EmptyArray.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/Microsoft/Internal/EmptyArray.cs
+@@ -2,14 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Collections.Generic;
+-using System.Composition;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-using System.Globalization;
+-using System.Reflection;
+-
+ namespace Microsoft.Internal
+ {
+     internal static class EmptyArray<T>
diff --git a/corefx-git/patches/patch-src_Common_src_System_IO_PathInternal.cs b/corefx-git/patches/patch-src_Common_src_System_IO_PathInternal.cs
new file mode 100644
index 0000000..53acdb5
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_System_IO_PathInternal.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/Common/src/System/IO/PathInternal.cs.orig	2016-02-25 00:30:19.844651590 +0000
++++ src/Common/src/System/IO/PathInternal.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics.Contracts;
+ using System.Text;
+ 
+ namespace System.IO
diff --git a/corefx-git/patches/patch-src_Common_src_System_Net_ContextAwareResult.cs b/corefx-git/patches/patch-src_Common_src_System_Net_ContextAwareResult.cs
new file mode 100644
index 0000000..2c833ec
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_System_Net_ContextAwareResult.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/Common/src/System/Net/ContextAwareResult.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/System/Net/ContextAwareResult.cs
+@@ -4,7 +4,6 @@
+ 
+ using System.Diagnostics;
+ using System.Security;
+-using System.Security.Principal;
+ using System.Threading;
+ 
+ namespace System.Net
diff --git a/corefx-git/patches/patch-src_Common_src_System_Net_DebugCriticalHandleMinusOneIsInvalid.cs b/corefx-git/patches/patch-src_Common_src_System_Net_DebugCriticalHandleMinusOneIsInvalid.cs
new file mode 100644
index 0000000..648941f
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_System_Net_DebugCriticalHandleMinusOneIsInvalid.cs
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/Common/src/System/Net/DebugCriticalHandleMinusOneIsInvalid.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/System/Net/DebugCriticalHandleMinusOneIsInvalid.cs
+@@ -4,13 +4,6 @@
+ 
+ using Microsoft.Win32.SafeHandles;
+ 
+-using System.Diagnostics.CodeAnalysis;
+-using System.Net.NetworkInformation;
+-using System.Net.Sockets;
+-using System.Runtime.CompilerServices;
+-using System.Runtime.InteropServices;
+-using System.Threading;
+-
+ namespace System.Net
+ {
+ #if DEBUG
diff --git a/corefx-git/patches/patch-src_Common_src_System_Net_DebugCriticalHandleZeroOrMinusOneIsInvalid.cs b/corefx-git/patches/patch-src_Common_src_System_Net_DebugCriticalHandleZeroOrMinusOneIsInvalid.cs
new file mode 100644
index 0000000..15647db
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_System_Net_DebugCriticalHandleZeroOrMinusOneIsInvalid.cs
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/Common/src/System/Net/DebugCriticalHandleZeroOrMinusOneIsInvalid.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/System/Net/DebugCriticalHandleZeroOrMinusOneIsInvalid.cs
+@@ -4,13 +4,6 @@
+ 
+ using Microsoft.Win32.SafeHandles;
+ 
+-using System.Diagnostics.CodeAnalysis;
+-using System.Net.NetworkInformation;
+-using System.Net.Sockets;
+-using System.Runtime.CompilerServices;
+-using System.Runtime.InteropServices;
+-using System.Threading;
+-
+ namespace System.Net
+ {
+ #if DEBUG
diff --git a/corefx-git/patches/patch-src_Common_src_System_Net_DebugSafeHandle.cs b/corefx-git/patches/patch-src_Common_src_System_Net_DebugSafeHandle.cs
new file mode 100644
index 0000000..c0e549c
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_System_Net_DebugSafeHandle.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/Common/src/System/Net/DebugSafeHandle.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/System/Net/DebugSafeHandle.cs
+@@ -4,7 +4,6 @@
+ 
+ using Microsoft.Win32.SafeHandles;
+ 
+-using System.Diagnostics.CodeAnalysis;
+ using System.Net.NetworkInformation;
+ using System.Net.Sockets;
+ using System.Runtime.CompilerServices;
diff --git a/corefx-git/patches/patch-src_Common_src_System_Net_DebugSafeHandleMinusOneIsInvalid.cs b/corefx-git/patches/patch-src_Common_src_System_Net_DebugSafeHandleMinusOneIsInvalid.cs
new file mode 100644
index 0000000..af01222
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_System_Net_DebugSafeHandleMinusOneIsInvalid.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/Common/src/System/Net/DebugSafeHandleMinusOneIsInvalid.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/System/Net/DebugSafeHandleMinusOneIsInvalid.cs
+@@ -4,7 +4,6 @@
+ 
+ using Microsoft.Win32.SafeHandles;
+ 
+-using System.Diagnostics.CodeAnalysis;
+ using System.Net.NetworkInformation;
+ using System.Net.Sockets;
+ using System.Runtime.CompilerServices;
diff --git a/corefx-git/patches/patch-src_Common_src_System_Net_Logging_LoggingHash.cs b/corefx-git/patches/patch-src_Common_src_System_Net_Logging_LoggingHash.cs
new file mode 100644
index 0000000..02826da
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_System_Net_Logging_LoggingHash.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/Common/src/System/Net/Logging/LoggingHash.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/System/Net/Logging/LoggingHash.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Diagnostics.CodeAnalysis;
+ using System.Diagnostics.Tracing;
+ using System.Globalization;
+ using System.Runtime.InteropServices;
diff --git a/corefx-git/patches/patch-src_Common_src_System_Net_NetworkInformation_HostInformationPal.NetNative.cs b/corefx-git/patches/patch-src_Common_src_System_Net_NetworkInformation_HostInformationPal.NetNative.cs
new file mode 100644
index 0000000..3d20abc
--- /dev/null
+++ b/corefx-git/patches/patch-src_Common_src_System_Net_NetworkInformation_HostInformationPal.NetNative.cs
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- src/Common/src/System/Net/NetworkInformation/HostInformationPal.NetNative.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Common/src/System/Net/NetworkInformation/HostInformationPal.NetNative.cs
+@@ -6,9 +6,7 @@ using System.Collections.Generic;
+ using System.Net;
+ using System.Runtime.InteropServices;
+ using System.Threading;
+-
+ using Windows.Networking;
+-using Windows.Networking.Connectivity;
+ 
+ namespace System.Net.NetworkInformation
+ {
+@@ -37,7 +35,7 @@ namespace System.Net.NetworkInformation
+         {
+             Interop.IpHlpApi.FIXED_INFO fixedInfo = new Interop.IpHlpApi.FIXED_INFO();
+ 
+-            IReadOnlyList<HostName> hostNamesList = Windows.Networking.Connectivity.NetworkInformation.GetHostNames();
++            IReadOnlyList<HostName> hostNamesList = global::Windows.Networking.Connectivity.NetworkInformation.GetHostNames();
+ 
+             foreach (HostName entry in hostNamesList)
+             {
diff --git a/corefx-git/patches/patch-src_System.AppContext_src_System.AppContext.csproj b/corefx-git/patches/patch-src_System.AppContext_src_System.AppContext.csproj
new file mode 100644
index 0000000..64f6018
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.AppContext_src_System.AppContext.csproj
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.AppContext/src/System.AppContext.csproj.orig	2016-02-10 10:03:58.000000000 +0000
++++ src/System.AppContext/src/System.AppContext.csproj
+@@ -32,6 +32,7 @@
+ 
+   <ItemGroup Condition="'$(TargetGroup)'=='netcore50'">
+     <TargetingPackReference Include="Windows" />
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
+     <Compile Include="System\AppContext.cs" />
+   </ItemGroup>
+   <ItemGroup Condition="'$(IsPartialFacadeAssembly)'=='true'">
diff --git a/corefx-git/patches/patch-src_System.Collections.Immutable_src_System.Collections.Immutable.csproj b/corefx-git/patches/patch-src_System.Collections.Immutable_src_System.Collections.Immutable.csproj
new file mode 100644
index 0000000..7b08fbe
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Collections.Immutable_src_System.Collections.Immutable.csproj
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Collections.Immutable/src/System.Collections.Immutable.csproj.orig	2016-02-10 10:03:58.000000000 +0000
++++ src/System.Collections.Immutable/src/System.Collections.Immutable.csproj
+@@ -7,8 +7,6 @@
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>System.Collections.Immutable</RootNamespace>
+     <AssemblyName>System.Collections.Immutable</AssemblyName>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+     <FileAlignment>512</FileAlignment>
+     <DocumentationFile>$(OutputPath)System.Collections.Immutable.xml</DocumentationFile>
+     <GenerateAppxPackageOnBuild>False</GenerateAppxPackageOnBuild>
diff --git a/corefx-git/patches/patch-src_System.Collections.Immutable_src_project.json b/corefx-git/patches/patch-src_System.Collections.Immutable_src_project.json
new file mode 100644
index 0000000..9f8122a
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Collections.Immutable_src_project.json
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/System.Collections.Immutable/src/project.json.orig	2016-02-25 00:30:49.137386861 +0000
++++ src/System.Collections.Immutable/src/project.json
+@@ -0,0 +1,17 @@
++{
++  "dependencies": {
++    "System.Collections": "4.0.0",
++    "System.Diagnostics.Contracts": "4.0.0",
++    "System.Diagnostics.Debug": "4.0.0",
++    "System.Linq": "4.0.0",
++    "System.Diagnostics.Tools": "4.0.0",
++    "System.Globalization": "4.0.0",
++    "System.Resources.ResourceManager": "4.0.0",
++    "System.Runtime": "4.0.0",
++    "System.Runtime.Extensions": "4.0.0",
++    "System.Threading": "4.0.0",
++  },
++  "frameworks": {
++    "dnxcore50": {}
++  }
++}
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System.Composition.AttributedModel.csproj b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System.Composition.AttributedModel.csproj
new file mode 100644
index 0000000..37c032a
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System.Composition.AttributedModel.csproj
@@ -0,0 +1,43 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj
+@@ -1,24 +1,14 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{C6257381-C624-494A-A9D9-5586E60856EA}</ProjectGuid>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>System.Composition</RootNamespace>
+     <AssemblyName>System.Composition.AttributedModel</AssemblyName>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+-
+     <Compile Include="System\Composition\Convention\AttributedModelProvider.cs" />
+     <Compile Include="System\Composition\ExportAttribute.cs" />
+     <Compile Include="System\Composition\ExportMetadataAttribute.cs" />
+@@ -34,11 +24,4 @@
+     <Compile Include="System\Composition\SharingBoundaryAttribute.cs" />
+   </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_Convention_AttributedModelProvider.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_Convention_AttributedModelProvider.cs
new file mode 100644
index 0000000..aa0f089
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_Convention_AttributedModelProvider.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/Convention/AttributedModelProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/Convention/AttributedModelProvider.cs
+@@ -2,12 +2,8 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+-using System.Linq;
+ using System.Reflection;
+-using System.Text;
+-using System.Threading.Tasks;
+ 
+ namespace System.Composition.Convention
+ {
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ExportAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ExportAttribute.cs
new file mode 100644
index 0000000..2e66377
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ExportAttribute.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/ExportAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/ExportAttribute.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Diagnostics.CodeAnalysis;
+ 
+ namespace System.Composition
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ExportMetadataAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ExportMetadataAttribute.cs
new file mode 100644
index 0000000..8bce885
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ExportMetadataAttribute.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/ExportMetadataAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/ExportMetadataAttribute.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportAttribute.cs
new file mode 100644
index 0000000..d2fe62c
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportAttribute.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/ImportAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/ImportAttribute.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Diagnostics.CodeAnalysis;
+ 
+ namespace System.Composition
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportManyAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportManyAttribute.cs
new file mode 100644
index 0000000..310db7a
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportManyAttribute.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/ImportManyAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/ImportManyAttribute.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Diagnostics.CodeAnalysis;
+ 
+ namespace System.Composition
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportMetadataConstraintAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportMetadataConstraintAttribute.cs
new file mode 100644
index 0000000..d90c5a5
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportMetadataConstraintAttribute.cs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/ImportMetadataConstraintAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/ImportMetadataConstraintAttribute.cs
+@@ -2,11 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Collections.Generic;
+-using System.Linq;
+-using System.Text;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportingConstructorAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportingConstructorAttribute.cs
new file mode 100644
index 0000000..5b25ca8
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_ImportingConstructorAttribute.cs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/ImportingConstructorAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/ImportingConstructorAttribute.cs
+@@ -2,9 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics.CodeAnalysis;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_MetadataAttributeAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_MetadataAttributeAttribute.cs
new file mode 100644
index 0000000..ffcf0b1
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_MetadataAttributeAttribute.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/MetadataAttributeAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/MetadataAttributeAttribute.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_OnImportsSatisfiedAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_OnImportsSatisfiedAttribute.cs
new file mode 100644
index 0000000..d79ff74
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_OnImportsSatisfiedAttribute.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/OnImportsSatisfiedAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/OnImportsSatisfiedAttribute.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_PartMetadataAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_PartMetadataAttribute.cs
new file mode 100644
index 0000000..acb5cc2
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_PartMetadataAttribute.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/PartMetadataAttribute.cs.orig	2016-02-25 00:30:19.879595452 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/PartMetadataAttribute.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_PartNotDiscoverableAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_PartNotDiscoverableAttribute.cs
new file mode 100644
index 0000000..f724815
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_PartNotDiscoverableAttribute.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/PartNotDiscoverableAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/PartNotDiscoverableAttribute.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_SharedAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_SharedAttribute.cs
new file mode 100644
index 0000000..b01ad79
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_SharedAttribute.cs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/SharedAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/SharedAttribute.cs
+@@ -2,11 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Collections.Generic;
+-using System.Linq;
+-using System.Text;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_SharingBoundaryAttribute.cs b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_SharingBoundaryAttribute.cs
new file mode 100644
index 0000000..ed8a677
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_System_Composition_SharingBoundaryAttribute.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/System/Composition/SharingBoundaryAttribute.cs.orig	2016-02-25 00:30:19.879636116 +0000
++++ src/System.Composition.AttributedModel/src/System/Composition/SharingBoundaryAttribute.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.ObjectModel;
+ 
+ namespace System.Composition
diff --git a/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_project.json b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_project.json
new file mode 100644
index 0000000..f98b4bb
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.AttributedModel_src_project.json
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/System.Composition.AttributedModel/src/project.json.orig	2016-02-25 00:30:49.138383401 +0000
++++ src/System.Composition.AttributedModel/src/project.json
+@@ -0,0 +1,12 @@
++{
++  "dependencies": {
++    "System.Collections": "4.0.0",
++    "System.Diagnostics.Debug": "4.0.0",
++    "System.Diagnostics.Tools": "4.0.0",
++    "System.Reflection": "4.0.0",
++    "System.Runtime": "4.0.0"
++  },
++  "frameworks": {
++    "dnxcore50": {}
++  }
++}
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Composition.Convention_src_System.Composition.Convention.csproj b/corefx-git/patches/patch-src_System.Composition.Convention_src_System.Composition.Convention.csproj
new file mode 100644
index 0000000..24771f2
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Convention_src_System.Composition.Convention.csproj
@@ -0,0 +1,46 @@
+$NetBSD$
+
+--- src/System.Composition.Convention/src/System.Composition.Convention.csproj.orig	2016-02-25 00:30:19.879692756 +0000
++++ src/System.Composition.Convention/src/System.Composition.Convention.csproj
+@@ -1,22 +1,13 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{E6592FAD-10B5-4B56-9287-D72DD136992F}</ProjectGuid>
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <AssemblyName>System.Composition.Convention</AssemblyName>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+-    <FileAlignment>512</FileAlignment>
+-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <Compile Include="$(CommonPath)\Microsoft\Internal\Assumes.cs">
+       <Link>Microsoft\Internal\Assumes.cs</Link>
+@@ -68,16 +59,5 @@
+       <Name>System.Composition.AttributedModel</Name>
+     </ProjectReference>
+   </ItemGroup>
+-  <ItemGroup>
+-    <Folder Include="Microsoft\Diagnostics\" />
+-    <Folder Include="Properties\" />
+-  </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Composition.Convention_src_project.json b/corefx-git/patches/patch-src_System.Composition.Convention_src_project.json
new file mode 100644
index 0000000..df4d700
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Convention_src_project.json
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- src/System.Composition.Convention/src/project.json.orig	2016-02-25 00:30:49.138513341 +0000
++++ src/System.Composition.Convention/src/project.json
+@@ -0,0 +1,18 @@
++{
++  "dependencies": {
++    "System.Collections": "4.0.0",
++    "System.Globalization": "4.0.0",
++    "System.Diagnostics.Contracts": "4.0.0",
++    "System.Diagnostics.Debug": "4.0.0",
++    "System.Diagnostics.Tools": "4.0.0",
++    "System.Linq": "4.0.0",
++    "System.Linq.Expressions": "4.0.0",
++    "System.Reflection": "4.0.0",
++    "System.Reflection.Extensions": "4.0.0",
++    "System.Resources.ResourceManager": "4.0.0",
++    "System.Threading": "4.0.0"
++  },
++  "frameworks": {
++    "dnxcore50": {}
++  }
++}
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Composition.Convention_tests_ExceptionAssert.cs b/corefx-git/patches/patch-src_System.Composition.Convention_tests_ExceptionAssert.cs
new file mode 100644
index 0000000..a378be0
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Convention_tests_ExceptionAssert.cs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Composition.Convention/tests/ExceptionAssert.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Convention/tests/ExceptionAssert.cs
+@@ -2,9 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Composition.UnitTests.Util;
+-using System.Runtime.Serialization;
+ using Xunit;
+ 
+ namespace System.Composition.Convention
diff --git a/corefx-git/patches/patch-src_System.Composition.Convention_tests_System.Composition.Convention.Tests.csproj b/corefx-git/patches/patch-src_System.Composition.Convention_tests_System.Composition.Convention.Tests.csproj
new file mode 100644
index 0000000..96509b9
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Convention_tests_System.Composition.Convention.Tests.csproj
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
+@@ -1,22 +1,13 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{853BB14F-8A5B-42B4-A053-21DE1AEBB335}</ProjectGuid>
+-    <OutputType>Library</OutputType>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>ConventionsUnitTests</RootNamespace>
+     <AssemblyName>System.Composition.Convention.Tests</AssemblyName>
+-    <FileAlignment>512</FileAlignment>
+-    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <TestProjectType>UnitTest</TestProjectType>
+-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <None Include="project.json" />
+   </ItemGroup>
+@@ -66,11 +57,4 @@
+     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+   </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System.Composition.Hosting.csproj b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System.Composition.Hosting.csproj
new file mode 100644
index 0000000..559e40b
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System.Composition.Hosting.csproj
@@ -0,0 +1,41 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System.Composition.Hosting.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System.Composition.Hosting.csproj
+@@ -1,22 +1,12 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}</ProjectGuid>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <AssemblyName>System.Composition.Hosting</AssemblyName>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+-    <FileAlignment>512</FileAlignment>
+-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <ProjectReference Include="..\..\System.Composition.Runtime\src\System.Composition.Runtime.csproj">
+       <Project>{2711dfd2-8541-4628-bc53-eb784a14cdcf}</Project>
+@@ -90,11 +80,4 @@
+     </EmbeddedResource>
+   </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_CompositionHost.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_CompositionHost.cs
new file mode 100644
index 0000000..fa4b260
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_CompositionHost.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/CompositionHost.cs.orig	2016-02-25 00:30:19.880237566 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/CompositionHost.cs
+@@ -8,8 +8,6 @@ using System.Composition.Hosting.Provide
+ using System.Composition.Hosting.Providers.ExportFactory;
+ using System.Composition.Hosting.Providers.ImportMany;
+ using System.Composition.Hosting.Providers.Lazy;
+-using System.Composition.Hosting.Providers.Metadata;
+-using System.Composition.Runtime;
+ using System.Linq;
+ 
+ using Microsoft.Internal;
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionDependency.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionDependency.cs
new file mode 100644
index 0000000..ebc3fe9
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionDependency.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/CompositionDependency.cs.orig	2016-02-25 00:30:19.880303618 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/CompositionDependency.cs
+@@ -4,7 +4,6 @@
+ 
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Util;
+-using System.Composition.Runtime;
+ using System.Linq;
+ using System.Text;
+ using Microsoft.Internal;
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionOperation.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionOperation.cs
new file mode 100644
index 0000000..009a73d
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CompositionOperation.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/CompositionOperation.cs.orig	2016-02-25 00:30:19.880355379 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/CompositionOperation.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Composition;
+ using System.Collections.Generic;
+ using System.Threading;
+ using Microsoft.Internal;
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingExportDescriptor.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingExportDescriptor.cs
new file mode 100644
index 0000000..0ed3eba
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingExportDescriptor.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/CycleBreakingExportDescriptor.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/CycleBreakingExportDescriptor.cs
+@@ -3,7 +3,6 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using Microsoft.Internal;
+-using System;
+ using System.Collections.Generic;
+ using System.Diagnostics;
+ 
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingMetadataDictionary.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingMetadataDictionary.cs
new file mode 100644
index 0000000..b5d80d3
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_CycleBreakingMetadataDictionary.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/CycleBreakingMetadataDictionary.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/CycleBreakingMetadataDictionary.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using Microsoft.Internal;
+ 
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_DependencyAccessor.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_DependencyAccessor.cs
new file mode 100644
index 0000000..210cc01
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_DependencyAccessor.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/DependencyAccessor.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/DependencyAccessor.cs
+@@ -3,7 +3,6 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using System.Collections.Generic;
+-using System.Composition.Runtime;
+ using System.Linq;
+ 
+ namespace System.Composition.Hosting.Core
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorPromise.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorPromise.cs
new file mode 100644
index 0000000..be335ce
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorPromise.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/ExportDescriptorPromise.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/ExportDescriptorPromise.cs
+@@ -2,10 +2,8 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Collections.ObjectModel;
+-using System.Composition.Runtime;
+ using System.Linq;
+ using Microsoft.Internal;
+ 
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistry.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistry.cs
new file mode 100644
index 0000000..fa3de8a
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistry.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/ExportDescriptorRegistry.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/ExportDescriptorRegistry.cs
+@@ -3,7 +3,6 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using System.Collections.Generic;
+-using System.Composition.Runtime;
+ using Microsoft.Internal;
+ 
+ namespace System.Composition.Hosting.Core
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistryUpdate.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistryUpdate.cs
new file mode 100644
index 0000000..4de8004
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_ExportDescriptorRegistryUpdate.cs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/ExportDescriptorRegistryUpdate.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/ExportDescriptorRegistryUpdate.cs
+@@ -3,11 +3,9 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using System.Collections.Generic;
+-using System.Composition.Runtime;
+ using System.Linq;
+ using System.Text;
+ using Microsoft.Internal;
+-using System.Composition.Hosting.Properties;
+ 
+ namespace System.Composition.Hosting.Core
+ {
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_LifetimeContext.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_LifetimeContext.cs
new file mode 100644
index 0000000..e088a0e
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Core_LifetimeContext.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Core/LifetimeContext.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Core/LifetimeContext.cs
+@@ -4,10 +4,8 @@
+ 
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Util;
+-using System.Composition.Runtime;
+ using System.Threading;
+ using Microsoft.Internal;
+-using System.Composition.Hosting.Properties;
+ 
+ namespace System.Composition.Hosting.Core
+ {
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Constants.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Constants.cs
new file mode 100644
index 0000000..2a320ef
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Constants.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/Constants.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/Constants.cs
+@@ -2,12 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Collections.Generic;
+-using System.Linq;
+-using System.Text;
+-using System.Threading.Tasks;
+-
+ namespace System.Composition.Hosting.Providers
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_CurrentScope_CurrentScopeExportDescriptorProvider.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_CurrentScope_CurrentScopeExportDescriptorProvider.cs
new file mode 100644
index 0000000..f0f8dfd
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_CurrentScope_CurrentScopeExportDescriptorProvider.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/CurrentScope/CurrentScopeExportDescriptorProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/CurrentScope/CurrentScopeExportDescriptorProvider.cs
+@@ -4,7 +4,6 @@
+ 
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ 
+ namespace System.Composition.Hosting.Providers.CurrentScope
+ {
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryExportDescriptorProvider.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryExportDescriptorProvider.cs
new file mode 100644
index 0000000..0b88e06
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryExportDescriptorProvider.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/ExportFactory/ExportFactoryExportDescriptorProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/ExportFactory/ExportFactoryExportDescriptorProvider.cs
+@@ -5,10 +5,8 @@
+ using System.Linq;
+ using System.Reflection;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Util;
+-using System.Composition.Hosting.Properties;
+ using Microsoft.Internal;
+ 
+ namespace System.Composition.Hosting.Providers.ExportFactory
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryWithMetadataExportDescriptorProvider.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryWithMetadataExportDescriptorProvider.cs
new file mode 100644
index 0000000..5f4993b
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ExportFactory_ExportFactoryWithMetadataExportDescriptorProvider.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/ExportFactory/ExportFactoryWithMetadataExportDescriptorProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/ExportFactory/ExportFactoryWithMetadataExportDescriptorProvider.cs
+@@ -5,12 +5,9 @@
+ using System.Reflection;
+ using System.Composition.Hosting.Util;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Linq;
+-using System.Threading;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Providers.Metadata;
+-using System.Composition.Hosting.Properties;
+ using Microsoft.Internal;
+ 
+ namespace System.Composition.Hosting.Providers.ExportFactory
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ImportMany_ImportManyExportDescriptorProvider.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ImportMany_ImportManyExportDescriptorProvider.cs
new file mode 100644
index 0000000..00532d6
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_ImportMany_ImportManyExportDescriptorProvider.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/ImportMany/ImportManyExportDescriptorProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/ImportMany/ImportManyExportDescriptorProvider.cs
+@@ -5,10 +5,8 @@
+ using System.Reflection;
+ using System.Composition.Hosting.Core;
+ using System.Composition.Hosting.Util;
+-using System.Composition.Runtime;
+ using System.Collections.Generic;
+ using System.Linq;
+-using System.Composition.Hosting.Properties;
+ 
+ namespace System.Composition.Hosting.Providers.ImportMany
+ {
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyExportDescriptorProvider.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyExportDescriptorProvider.cs
new file mode 100644
index 0000000..ab5c367
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyExportDescriptorProvider.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/Lazy/LazyExportDescriptorProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/Lazy/LazyExportDescriptorProvider.cs
+@@ -5,10 +5,8 @@
+ using System.Linq;
+ using System.Reflection;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Util;
+-using System.Composition.Hosting.Properties;
+ 
+ namespace System.Composition.Hosting.Providers.Lazy
+ {
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyWithMetadataExportDescriptorProvider.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyWithMetadataExportDescriptorProvider.cs
new file mode 100644
index 0000000..f6303c1
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Lazy_LazyWithMetadataExportDescriptorProvider.cs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/Lazy/LazyWithMetadataExportDescriptorProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/Lazy/LazyWithMetadataExportDescriptorProvider.cs
+@@ -4,9 +4,7 @@
+ 
+ using System.Reflection;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Linq;
+-using System.Threading;
+ using System.Composition.Hosting.Util;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Providers.Metadata;
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Metadata_MetadataViewProvider.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Metadata_MetadataViewProvider.cs
new file mode 100644
index 0000000..a28eef0
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Providers_Metadata_MetadataViewProvider.cs
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/Metadata/MetadataViewProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Providers/Metadata/MetadataViewProvider.cs
+@@ -2,16 +2,11 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.ComponentModel;
+-using System.Composition.Hosting.Core;
+-using System.Composition.Hosting.Util;
+ using System.Linq;
+ using System.Linq.Expressions;
+ using System.Reflection;
+-using System.Text;
+-using System.Threading.Tasks;
+ using Microsoft.Internal;
+ 
+ namespace System.Composition.Hosting.Providers.Metadata
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_Formatters.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_Formatters.cs
new file mode 100644
index 0000000..17506df
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_Formatters.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Util/Formatters.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Util/Formatters.cs
+@@ -3,10 +3,7 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using System.Collections.Generic;
+-using System.Globalization;
+ using System.Linq;
+-using System.Text;
+-
+ using Microsoft.Internal;
+ 
+ namespace System.Composition.Hosting.Util
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_SmallSparseInitonlyArray.cs b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_SmallSparseInitonlyArray.cs
new file mode 100644
index 0000000..0656e56
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_System_Composition_Hosting_Util_SmallSparseInitonlyArray.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/System/Composition/Hosting/Util/SmallSparseInitonlyArray.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Hosting/src/System/Composition/Hosting/Util/SmallSparseInitonlyArray.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Composition.Hosting;
+-
+ using Microsoft.Internal;
+ 
+ namespace System.Composition.Hosting.Util
diff --git a/corefx-git/patches/patch-src_System.Composition.Hosting_src_project.json b/corefx-git/patches/patch-src_System.Composition.Hosting_src_project.json
new file mode 100644
index 0000000..54bd96d
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Hosting_src_project.json
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- src/System.Composition.Hosting/src/project.json.orig	2016-02-25 00:30:49.139937467 +0000
++++ src/System.Composition.Hosting/src/project.json
+@@ -0,0 +1,19 @@
++{
++  "dependencies": {
++    "System.Collections": "4.0.0",
++    "System.Diagnostics.Contracts": "4.0.0",
++    "System.Diagnostics.Debug": "4.0.0",
++    "System.Diagnostics.Tools": "4.0.0",
++    "System.Globalization": "4.0.0",
++    "System.Linq": "4.0.0",
++    "System.Linq.Expressions": "4.0.0",
++    "System.ObjectModel": "4.0.0",
++    "System.Reflection": "4.0.0",
++    "System.Reflection.Extensions": "4.0.0",
++    "System.Resources.ResourceManager": "4.0.0",
++    "System.Threading": "4.0.0"
++  },
++  "frameworks": {
++    "dnxcore50": {}
++  }
++}
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_System.Composition.Runtime.csproj b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System.Composition.Runtime.csproj
new file mode 100644
index 0000000..8ebc3db
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System.Composition.Runtime.csproj
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/System.Composition.Runtime.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Runtime/src/System.Composition.Runtime.csproj
+@@ -1,23 +1,13 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{2711DFD2-8541-4628-BC53-EB784A14CDCF}</ProjectGuid>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>System.Composition</RootNamespace>
+     <AssemblyName>System.Composition.Runtime</AssemblyName>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+-    <FileAlignment>512</FileAlignment>
+-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+   <ItemGroup>
+     <EmbeddedResource Include="Properties\Resources.resx">
+       <Generator>ResXFileCodeGenerator</Generator>
+@@ -39,11 +29,4 @@
+     <Compile Include="System\Composition\Runtime\Util\Formatters.cs" />
+   </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_CompositionContext.cs b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_CompositionContext.cs
new file mode 100644
index 0000000..6a0e94a
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_CompositionContext.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/System/Composition/CompositionContext.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Runtime/src/System/Composition/CompositionContext.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Reflection;
+-using System.Composition.Runtime;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+ using System.Composition.Hosting;
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfT.cs b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfT.cs
new file mode 100644
index 0000000..320ec35
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfT.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/System/Composition/ExportFactoryOfT.cs.orig	2016-02-25 00:30:19.880452668 +0000
++++ src/System.Composition.Runtime/src/System/Composition/ExportFactoryOfT.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfTTMetadata.cs b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfTTMetadata.cs
new file mode 100644
index 0000000..a0d40cf
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportFactoryOfTTMetadata.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/System/Composition/ExportFactoryOfTTMetadata.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Runtime/src/System/Composition/ExportFactoryOfTTMetadata.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportOfT.cs b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportOfT.cs
new file mode 100644
index 0000000..5972091
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_ExportOfT.cs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/System/Composition/ExportOfT.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Runtime/src/System/Composition/ExportOfT.cs
+@@ -2,9 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Linq;
+-
+ namespace System.Composition
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Hosting_CompositionFailedException.cs b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Hosting_CompositionFailedException.cs
new file mode 100644
index 0000000..7c79a73
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Hosting_CompositionFailedException.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/System/Composition/Hosting/CompositionFailedException.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.Runtime/src/System/Composition/Hosting/CompositionFailedException.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-
+ namespace System.Composition.Hosting
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Hosting_Core_CompositionContract.cs b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Hosting_Core_CompositionContract.cs
new file mode 100644
index 0000000..2c4fd55
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Hosting_Core_CompositionContract.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/System/Composition/Hosting/Core/CompositionContract.cs.orig	2016-02-25 00:30:19.880544365 +0000
++++ src/System.Composition.Runtime/src/System/Composition/Hosting/Core/CompositionContract.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections;
+ using System.Collections.Generic;
+ using System.Composition.Runtime.Util;
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Runtime_Util_Formatters.cs b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Runtime_Util_Formatters.cs
new file mode 100644
index 0000000..25c3383
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_System_Composition_Runtime_Util_Formatters.cs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/System/Composition/Runtime/Util/Formatters.cs.orig	2016-02-25 00:30:19.880600317 +0000
++++ src/System.Composition.Runtime/src/System/Composition/Runtime/Util/Formatters.cs
+@@ -2,11 +2,7 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Collections.Generic;
+ using System.Linq;
+-using System.Text;
+-using System.Threading.Tasks;
+ 
+ namespace System.Composition.Runtime.Util
+ {
diff --git a/corefx-git/patches/patch-src_System.Composition.Runtime_src_project.json b/corefx-git/patches/patch-src_System.Composition.Runtime_src_project.json
new file mode 100644
index 0000000..6b02c30
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.Runtime_src_project.json
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- src/System.Composition.Runtime/src/project.json.orig	2016-02-25 00:30:49.140475255 +0000
++++ src/System.Composition.Runtime/src/project.json
+@@ -0,0 +1,14 @@
++{
++  "dependencies": {
++    "System.Collections": "4.0.0",
++    "System.Diagnostics.Debug": "4.0.0",
++    "System.Diagnostics.Tools": "4.0.0",
++    "System.Globalization": "4.0.0",
++    "System.Linq": "4.0.0",
++    "System.Reflection": "4.0.0",
++    "System.Resources.ResourceManager": "4.0.0",
++  },
++  "frameworks": {
++    "dnxcore50": {}
++  }
++}
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System.Composition.TypedParts.csproj b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System.Composition.TypedParts.csproj
new file mode 100644
index 0000000..2989aef
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System.Composition.TypedParts.csproj
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
+@@ -1,23 +1,13 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}</ProjectGuid>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>System.Composition</RootNamespace>
+     <AssemblyName>System.Composition.TypedParts</AssemblyName>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+-    <FileAlignment>512</FileAlignment>
+-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <PropertyGroup>
+     <ExternallyShipping>true</ExternallyShipping>
+   </PropertyGroup>
+@@ -73,11 +63,4 @@
+     </EmbeddedResource>
+   </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_CompositionContextExtensions.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_CompositionContextExtensions.cs
new file mode 100644
index 0000000..09fe615
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_CompositionContextExtensions.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/CompositionContextExtensions.cs.orig	2016-02-25 00:30:19.880665674 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/CompositionContextExtensions.cs
+@@ -4,7 +4,6 @@
+ 
+ using System.Composition.Convention;
+ using System.Composition.Hosting;
+-using System.Composition.Runtime;
+ using System.Composition.TypedParts;
+ using System.Composition.TypedParts.ActivationFeatures;
+ using System.Composition.TypedParts.Util;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_Convention_AttributedModelProviderExtensions.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_Convention_AttributedModelProviderExtensions.cs
new file mode 100644
index 0000000..9aa5c08
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_Convention_AttributedModelProviderExtensions.cs
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/Convention/AttributedModelProviderExtensions.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/Convention/AttributedModelProviderExtensions.cs
+@@ -2,13 +2,8 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Collections.Generic;
+-using System.Composition.Convention;
+ using System.Linq;
+ using System.Reflection;
+-using System.Text;
+-using System.Threading.Tasks;
+ 
+ namespace System.Composition.Convention
+ {
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_Debugging_DiscoveredPartDebuggerProxy.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_Debugging_DiscoveredPartDebuggerProxy.cs
new file mode 100644
index 0000000..8da45a3
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_Debugging_DiscoveredPartDebuggerProxy.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/Debugging/DiscoveredPartDebuggerProxy.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/Debugging/DiscoveredPartDebuggerProxy.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.TypedParts.Discovery;
+ using System.Linq;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_ActivationFeature.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_ActivationFeature.cs
new file mode 100644
index 0000000..4b21992
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_ActivationFeature.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/ActivationFeature.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/ActivationFeature.cs
+@@ -3,7 +3,6 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using Microsoft.Internal;
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+ using System.Reflection;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_DisposalFeature.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_DisposalFeature.cs
new file mode 100644
index 0000000..e0af45c
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_DisposalFeature.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/DisposalFeature.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/DisposalFeature.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+ using System.Reflection;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_LifetimeFeature.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_LifetimeFeature.cs
new file mode 100644
index 0000000..87ae674
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_LifetimeFeature.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/LifetimeFeature.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/LifetimeFeature.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+ using System.Reflection;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_OnImportsSatisfiedFeature.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_OnImportsSatisfiedFeature.cs
new file mode 100644
index 0000000..61765e2
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_OnImportsSatisfiedFeature.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/OnImportsSatisfiedFeature.cs.orig	2016-02-25 00:30:19.880800885 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/OnImportsSatisfiedFeature.cs
+@@ -2,12 +2,10 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Convention;
+ using System.Composition.Hosting;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Linq;
+ using System.Linq.Expressions;
+ using System.Reflection;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_PropertyInjectionFeature.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_PropertyInjectionFeature.cs
new file mode 100644
index 0000000..b18de97
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ActivationFeatures_PropertyInjectionFeature.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/PropertyInjectionFeature.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/ActivationFeatures/PropertyInjectionFeature.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+ using System.Linq;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ContractHelpers.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ContractHelpers.cs
new file mode 100644
index 0000000..a15229a
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_ContractHelpers.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/ContractHelpers.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/ContractHelpers.cs
+@@ -2,12 +2,10 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Reflection;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Composition.TypedParts.ActivationFeatures;
+ using System.Composition.Hosting;
+ 
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredExport.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredExport.cs
new file mode 100644
index 0000000..90313a2
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredExport.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/DiscoveredExport.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/DiscoveredExport.cs
+@@ -2,12 +2,9 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Diagnostics;
+-using System.Linq;
+ using System.Reflection;
+ 
+ namespace System.Composition.TypedParts.Discovery
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredInstanceExport.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredInstanceExport.cs
new file mode 100644
index 0000000..c3cdcba
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredInstanceExport.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/DiscoveredInstanceExport.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/DiscoveredInstanceExport.cs
+@@ -4,7 +4,6 @@
+ 
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Reflection;
+ 
+ namespace System.Composition.TypedParts.Discovery
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPart.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPart.cs
new file mode 100644
index 0000000..a0d92b4
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPart.cs
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/DiscoveredPart.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/DiscoveredPart.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Reflection;
+@@ -11,7 +10,6 @@ using System.Diagnostics;
+ using System.Composition.Debugging;
+ using System.Composition.TypedParts.ActivationFeatures;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Composition.Convention;
+ using System.Composition.Hosting;
+ 
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPropertyExport.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPropertyExport.cs
new file mode 100644
index 0000000..3ed1ee0
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_DiscoveredPropertyExport.cs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/DiscoveredPropertyExport.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/DiscoveredPropertyExport.cs
+@@ -2,11 +2,8 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+-using System.Linq;
+ using System.Linq.Expressions;
+ using System.Reflection;
+ 
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_TypeInspector.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_TypeInspector.cs
new file mode 100644
index 0000000..ebf180b
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Discovery_TypeInspector.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/TypeInspector.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/Discovery/TypeInspector.cs
+@@ -2,12 +2,10 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Convention;
+ using System.Composition.Hosting;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Composition.TypedParts.ActivationFeatures;
+ using System.Linq;
+ using System.Reflection;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_TypedPartExportDescriptorProvider.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_TypedPartExportDescriptorProvider.cs
new file mode 100644
index 0000000..7f7c93f
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_TypedPartExportDescriptorProvider.cs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/TypedPartExportDescriptorProvider.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/TypedPartExportDescriptorProvider.cs
+@@ -2,11 +2,9 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+ using System.Collections.Generic;
+ using System.Composition.Convention;
+ using System.Composition.Hosting.Core;
+-using System.Composition.Runtime;
+ using System.Composition.TypedParts.ActivationFeatures;
+ using System.Composition.TypedParts.Discovery;
+ using System.Linq;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Util_DirectAttributeContext.cs b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Util_DirectAttributeContext.cs
new file mode 100644
index 0000000..9565a76
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_System_Composition_TypedParts_Util_DirectAttributeContext.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs.orig	2016-02-25 00:30:19.880849102 +0000
++++ src/System.Composition.TypedParts/src/System/Composition/TypedParts/Util/DirectAttributeContext.cs
+@@ -3,7 +3,6 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using System.Collections.Generic;
+-using System.Linq;
+ using System.Reflection;
+ using System.Composition.Convention;
+ using Microsoft.Internal;
diff --git a/corefx-git/patches/patch-src_System.Composition.TypedParts_src_project.json b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_project.json
new file mode 100644
index 0000000..da1f4af
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition.TypedParts_src_project.json
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- src/System.Composition.TypedParts/src/project.json.orig	2016-02-25 00:30:49.141557737 +0000
++++ src/System.Composition.TypedParts/src/project.json
+@@ -0,0 +1,17 @@
++{
++  "dependencies": {
++    "System.Collections": "4.0.0",
++    "System.Diagnostics.Debug": "4.0.0",
++    "System.Diagnostics.Tools": "4.0.0",
++    "System.Globalization": "4.0.0",
++    "System.Linq": "4.0.0",
++    "System.Linq.Expressions": "4.0.0",
++    "System.Reflection": "4.0.0",
++    "System.Reflection.Extensions": "4.0.0",
++    "System.Resources.ResourceManager": "4.0.0",
++    "System.Runtime.Extensions": "4.0.0"
++  },
++  "frameworks": {
++    "dnxcore50": {}
++  }
++}
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_KeyByMetadataAttribute.cs b/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_KeyByMetadataAttribute.cs
new file mode 100644
index 0000000..5299ba6
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_KeyByMetadataAttribute.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/KeyByMetadataAttribute.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/KeyByMetadataAttribute.cs
+@@ -3,7 +3,6 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using System;
+-using System.Collections.Generic;
+ using System.Composition;
+ 
+ namespace Microsoft.Composition.Demos.ExtendedCollectionImports
diff --git a/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_Microsoft.Composition.Demos.ExtendedCollectionImports.csproj b/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_Microsoft.Composition.Demos.ExtendedCollectionImports.csproj
new file mode 100644
index 0000000..f9357dd
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_Microsoft.Composition.Demos.ExtendedCollectionImports.csproj
@@ -0,0 +1,46 @@
+$NetBSD$
+
+--- src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj
+@@ -1,23 +1,13 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{44C7E52C-3873-4C64-875C-8A23A8376D60}</ProjectGuid>
+-    <OutputType>Library</OutputType>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>Microsoft.Composition.Demos.ExtendedCollectionImports</RootNamespace>
+     <AssemblyName>Microsoft.Composition.Demos.ExtendedCollectionImports</AssemblyName>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+-    <FileAlignment>512</FileAlignment>
+-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <Compile Include="AssemblyInfo.cs" />
+     <Compile Include="Dictionaries\DictionaryExportDescriptorProvider.cs" />
+@@ -43,15 +33,5 @@
+       <Name>System.Composition.Runtime</Name>
+     </ProjectReference>
+   </ItemGroup>
+-  <ItemGroup>
+-    <Folder Include="Properties\" />
+-  </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_project.json b/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_project.json
new file mode 100644
index 0000000..1747962
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition_demos_Microsoft.Composition.Demos.ExtendedCollectionImports_project.json
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json.orig	2016-02-25 00:30:49.141746628 +0000
++++ src/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/project.json
+@@ -0,0 +1,10 @@
++{
++  "dependencies": {
++    "System.Collections": "4.0.0",
++    "System.Linq": "4.0.0",
++    "System.Reflection": "4.0.0",
++  },
++  "frameworks": {
++    "dnxcore50": {}
++  }
++}
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Composition_perftests_Microsoft.Composition.ThroughputHarness.csproj b/corefx-git/patches/patch-src_System.Composition_perftests_Microsoft.Composition.ThroughputHarness.csproj
new file mode 100644
index 0000000..57e737e
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition_perftests_Microsoft.Composition.ThroughputHarness.csproj
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- src/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj
+@@ -1,6 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{E3E3DA53-B8AC-46B6-8AAB-EBF751A2D0C3}</ProjectGuid>
+@@ -8,12 +7,9 @@
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>CompositionThroughput</RootNamespace>
+     <AssemblyName>CompositionThroughput</AssemblyName>
+-    <FileAlignment>512</FileAlignment>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <Compile Include="Benchmark.cs" />
+     <Compile Include="ControlBenchmark.cs" />
+@@ -54,15 +50,5 @@
+       <Name>System.Composition.TypedParts</Name>
+     </ProjectReference>
+   </ItemGroup>
+-  <ItemGroup>
+-    <Folder Include="Properties\" />
+-  </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_TestClass.cs b/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_TestClass.cs
new file mode 100644
index 0000000..0f0b587
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_TestClass.cs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/System.Composition/scenarios/TestLibrary/TestClass.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition/scenarios/TestLibrary/TestClass.cs
+@@ -3,11 +3,7 @@
+ // See the LICENSE file in the project root for more information.
+ 
+ using System;
+-using System.Collections.Generic;
+ using System.Composition;
+-using System.Linq;
+-using System.Text;
+-using System.Threading.Tasks;
+ 
+ [assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+ 
diff --git a/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_TestLibrary.csproj b/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_TestLibrary.csproj
new file mode 100644
index 0000000..22da5e6
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_TestLibrary.csproj
@@ -0,0 +1,43 @@
+$NetBSD$
+
+--- src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition/scenarios/TestLibrary/TestLibrary.csproj
+@@ -1,24 +1,13 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3}</ProjectGuid>
+-    <OutputType>Library</OutputType>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>TestLibrary</RootNamespace>
+     <AssemblyName>TestLibrary</AssemblyName>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+-    <FileAlignment>512</FileAlignment>
+-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\oob\</SolutionDir>
+-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <Compile Include="TestClass.cs" />
+     <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs">
+@@ -32,11 +21,4 @@
+     </ProjectReference>
+   </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_project.json b/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_project.json
new file mode 100644
index 0000000..cddf157
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition_scenarios_TestLibrary_project.json
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Composition/scenarios/TestLibrary/project.json.orig	2016-02-25 00:30:49.141983894 +0000
++++ src/System.Composition/scenarios/TestLibrary/project.json
+@@ -0,0 +1,8 @@
++{
++  "dependencies": {
++    "System.Runtime": "4.0.0",
++  },
++  "frameworks": {
++    "dnxcore50": {}
++  }
++}
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Composition_tests_System.Composition.Tests.csproj b/corefx-git/patches/patch-src_System.Composition_tests_System.Composition.Tests.csproj
new file mode 100644
index 0000000..68f0008
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Composition_tests_System.Composition.Tests.csproj
@@ -0,0 +1,51 @@
+$NetBSD$
+
+--- src/System.Composition/tests/System.Composition.Tests.csproj.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Composition/tests/System.Composition.Tests.csproj
+@@ -2,27 +2,12 @@
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+-    <ProductVersion>
+-    </ProductVersion>
+-    <SchemaVersion>2.0</SchemaVersion>
+     <ProjectGuid>{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}</ProjectGuid>
+-    <OutputType>Library</OutputType>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>System.Composition.Lightweight.UnitTests</RootNamespace>
+     <AssemblyName>System.Composition.Tests</AssemblyName>
+-    <FileAlignment>512</FileAlignment>
+-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+-    <ExternallyShipping>false</ExternallyShipping>
+   </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+-  </PropertyGroup>
+-  <ItemGroup>
+-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+-      <Visible>False</Visible>
+-    </CodeAnalysisDependentAssemblyPaths>
+-  </ItemGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <Compile Include="ActivationEventOrderingTests.cs" />
+     <Compile Include="CardinalityTests.cs" />
+@@ -87,15 +72,5 @@
+   <ItemGroup>
+     <None Include="project.json" />
+   </ItemGroup>
+-  <ItemGroup>
+-    <Folder Include="Properties\" />
+-  </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+-  <!-- 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>
+-  -->
+ </Project>
+\ No newline at end of file
diff --git a/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_ActivityTracker.cs b/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_ActivityTracker.cs
new file mode 100644
index 0000000..a1d61df
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_ActivityTracker.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/ActivityTracker.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/ActivityTracker.cs
+@@ -14,7 +14,6 @@ using Contract = Microsoft.Diagnostics.C
+ #if ES_BUILD_STANDALONE
+ namespace Microsoft.Diagnostics.Tracing
+ #else
+-using System.Threading.Tasks;
+ namespace System.Diagnostics.Tracing
+ #endif
+ {
diff --git a/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSource.cs b/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSource.cs
new file mode 100644
index 0000000..b10d6a1
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSource.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSource.cs.orig	2016-02-25 00:30:19.899697568 +0000
++++ src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSource.cs
+@@ -195,8 +195,6 @@ using Microsoft.Win32;
+ 
+ #if ES_BUILD_STANDALONE
+ using EventDescriptor = Microsoft.Diagnostics.Tracing.EventDescriptor;
+-#else
+-using System.Threading.Tasks;
+ #endif
+ 
+ using Microsoft.Reflection;
diff --git a/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSourceException.cs b/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSourceException.cs
new file mode 100644
index 0000000..713df34
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Diagnostics.Tracing_src_System_Diagnostics_Tracing_EventSourceException.cs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSourceException.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSourceException.cs
+@@ -2,9 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Runtime.Serialization;
+-
+ #if ES_BUILD_STANDALONE
+ using Environment = Microsoft.Diagnostics.Tracing.Internal.Environment;
+ #endif
diff --git a/corefx-git/patches/patch-src_System.IO.FileSystem_src_System.IO.FileSystem.csproj b/corefx-git/patches/patch-src_System.IO.FileSystem_src_System.IO.FileSystem.csproj
new file mode 100644
index 0000000..8249ac9
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.IO.FileSystem_src_System.IO.FileSystem.csproj
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.IO.FileSystem/src/System.IO.FileSystem.csproj.orig	2016-02-25 00:30:19.910865554 +0000
++++ src/System.IO.FileSystem/src/System.IO.FileSystem.csproj
+@@ -35,7 +35,8 @@
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
+ 
+   <ItemGroup Condition="'$(EnableWinRT)' == 'true'">
+-    <TargetingPackReference Include="windows" />
++    <TargetingPackReference Include="Windows" />
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
+   </ItemGroup>
+ 
+   <ItemGroup Condition="'$(TargetGroup)' != 'net46'">
diff --git a/corefx-git/patches/patch-src_System.IO.FileSystem_src_System_IO_WinRTFileSystem.cs b/corefx-git/patches/patch-src_System.IO.FileSystem_src_System_IO_WinRTFileSystem.cs
new file mode 100644
index 0000000..79033b5
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.IO.FileSystem_src_System_IO_WinRTFileSystem.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.IO.FileSystem/src/System/IO/WinRTFileSystem.cs.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/System.IO.FileSystem/src/System/IO/WinRTFileSystem.cs
+@@ -563,7 +563,7 @@ namespace System.IO
+                 throw Win32Marshal.GetExceptionForWin32Error(Interop.mincore.Errors.ERROR_DIR_NOT_EMPTY, fullPath);
+ 
+             // StorageFolder.Delete ignores readonly attribute.  Detect and throw.
+-            if ((folder.Attributes & Windows.Storage.FileAttributes.ReadOnly) == Windows.Storage.FileAttributes.ReadOnly)
++            if ((folder.Attributes & WinRTFileAttributes.ReadOnly) == WinRTFileAttributes.ReadOnly)
+                 throw new IOException(SR.Format(SR.UnauthorizedAccess_IODenied_Path, fullPath));
+ 
+             StorageFolder parentFolder = await folder.GetParentAsync().TranslateWinRTTask(fullPath, isDirectory: true);
diff --git a/corefx-git/patches/patch-src_System.IO.IsolatedStorage_src_System.IO.IsolatedStorage.csproj b/corefx-git/patches/patch-src_System.IO.IsolatedStorage_src_System.IO.IsolatedStorage.csproj
new file mode 100644
index 0000000..20f9322
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.IO.IsolatedStorage_src_System.IO.IsolatedStorage.csproj
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj.orig	2016-02-25 00:30:19.913492433 +0000
++++ src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
+@@ -15,6 +15,7 @@
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50_Debug|AnyCPU'" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50_Release|AnyCPU'" />
+   <ItemGroup>
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
+     <TargetingPackReference Include="Windows" />
+   </ItemGroup>
+   <ItemGroup>
diff --git a/corefx-git/patches/patch-src_System.Net.Http_src_System.Net.Http.csproj b/corefx-git/patches/patch-src_System.Net.Http_src_System.Net.Http.csproj
new file mode 100644
index 0000000..ced3ccd
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.Http_src_System.Net.Http.csproj
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Net.Http/src/System.Net.Http.csproj.orig	2016-02-25 00:30:19.939450329 +0000
++++ src/System.Net.Http/src/System.Net.Http.csproj
+@@ -302,6 +302,7 @@
+   </ItemGroup>
+ 
+   <ItemGroup Condition="'$(TargetGroup)' == 'netcore50'">
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
+     <Compile Include="$(CommonPath)\System\NotImplemented.cs">
+       <Link>Common\System\NotImplemented.cs</Link>
+     </Compile>
diff --git a/corefx-git/patches/patch-src_System.Net.NameResolution_System.Net.NameResolution.sln b/corefx-git/patches/patch-src_System.Net.NameResolution_System.Net.NameResolution.sln
new file mode 100644
index 0000000..1b2b93f
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.NameResolution_System.Net.NameResolution.sln
@@ -0,0 +1,73 @@
+$NetBSD$
+
+--- src/System.Net.NameResolution/System.Net.NameResolution.sln.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Net.NameResolution/System.Net.NameResolution.sln
+@@ -1,7 +1,7 @@
+ 
+ Microsoft Visual Studio Solution File, Format Version 12.00
+ # Visual Studio 14
+-VisualStudioVersion = 14.0.23107.0
++VisualStudioVersion = 14.0.24720.0
+ MinimumVisualStudioVersion = 10.0.40219.1
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{EC3CAC27-AC09-4A62-BBE3-87FB0AFF5EF2}"
+ EndProject
+@@ -19,11 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Functional.Tests", "tests\FunctionalTests\System.Net.NameResolution.Functional.Tests.csproj", "{4FE5ECEE-ACC5-4558-A946-573426599B73}"
+ EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Linux.Pal.Tests", "tests\PalTests\System.Net.NameResolution.Linux.Pal.Tests.csproj", "{F6D1C093-081D-46DE-B5A8-516533375FDD}"
+-EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.OSX.Pal.Tests", "tests\PalTests\System.Net.NameResolution.OSX.Pal.Tests.csproj", "{4C70E926-14E6-4176-9B0E-D6E36D142A47}"
+-EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Windows.Pal.Tests", "tests\PalTests\System.Net.NameResolution.Windows.Pal.Tests.csproj", "{C2A9E586-CB17-44BE-AAC9-904D53899B95}"
++Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.NameResolution.Pal.Tests", "tests\PalTests\System.Net.NameResolution.Pal.Tests.csproj", "{F6D1C093-081D-46DE-B5A8-516533375FDD}"
+ EndProject
+ Global
+ 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+@@ -101,38 +97,6 @@ Global
+ 		{F6D1C093-081D-46DE-B5A8-516533375FDD}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
+ 		{F6D1C093-081D-46DE-B5A8-516533375FDD}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
+ 		{F6D1C093-081D-46DE-B5A8-516533375FDD}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Linux_Release|Any CPU.Build.0 = Linux_Release|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.OSX_Debug|Any CPU.ActiveCfg = OSX_Debug|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.OSX_Debug|Any CPU.Build.0 = OSX_Debug|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.OSX_Release|Any CPU.ActiveCfg = OSX_Release|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.OSX_Release|Any CPU.Build.0 = OSX_Release|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Linux_Release|Any CPU.Build.0 = Linux_Release|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.OSX_Debug|Any CPU.ActiveCfg = OSX_Debug|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.OSX_Debug|Any CPU.Build.0 = OSX_Debug|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.OSX_Release|Any CPU.ActiveCfg = OSX_Release|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.OSX_Release|Any CPU.Build.0 = OSX_Release|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
+ 	EndGlobalSection
+ 	GlobalSection(SolutionProperties) = preSolution
+ 		HideSolutionNode = FALSE
+@@ -144,7 +108,5 @@ Global
+ 		{B4ECAB65-25BE-429A-AC6C-924174138F0B} = {1FBB81D4-E5E8-4F31-8F23-02DFDFC6339F}
+ 		{4FE5ECEE-ACC5-4558-A946-573426599B73} = {9828545B-B1F9-4321-AC18-5A223661C0AA}
+ 		{F6D1C093-081D-46DE-B5A8-516533375FDD} = {B4ECAB65-25BE-429A-AC6C-924174138F0B}
+-		{4C70E926-14E6-4176-9B0E-D6E36D142A47} = {B4ECAB65-25BE-429A-AC6C-924174138F0B}
+-		{C2A9E586-CB17-44BE-AAC9-904D53899B95} = {B4ECAB65-25BE-429A-AC6C-924174138F0B}
+ 	EndGlobalSection
+ EndGlobal
diff --git a/corefx-git/patches/patch-src_System.Net.NetworkInformation_src_System.Net.NetworkInformation.csproj b/corefx-git/patches/patch-src_System.Net.NetworkInformation_src_System.Net.NetworkInformation.csproj
new file mode 100644
index 0000000..35849f6
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.NetworkInformation_src_System.Net.NetworkInformation.csproj
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
+@@ -413,6 +413,9 @@
+     <TargetingPackReference Include="mscorlib" />
+     <TargetingPackReference Include="System" />
+   </ItemGroup>
++  <ItemGroup Condition="'$(TargetGroup)' == 'netcore50'">
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
++  </ItemGroup>
+   <ItemGroup>
+     <None Include="project.json" />
+   </ItemGroup>
diff --git a/corefx-git/patches/patch-src_System.Net.Primitives_src_System.Net.Primitives.csproj b/corefx-git/patches/patch-src_System.Net.Primitives_src_System.Net.Primitives.csproj
new file mode 100644
index 0000000..4359126
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.Primitives_src_System.Net.Primitives.csproj
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Net.Primitives/src/System.Net.Primitives.csproj.orig	2016-02-25 00:30:19.946266969 +0000
++++ src/System.Net.Primitives/src/System.Net.Primitives.csproj
+@@ -237,6 +237,10 @@
+     <TargetingPackReference Include="System" />
+   </ItemGroup>
+ 
++  <ItemGroup Condition="'$(TargetGroup)' == 'netcore50'">
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
++  </ItemGroup>
++
+   <ItemGroup>
+     <None Include="project.json" />
+   </ItemGroup>
diff --git a/corefx-git/patches/patch-src_System.Net.Primitives_src_System_Net_CookieException.cs b/corefx-git/patches/patch-src_System.Net.Primitives_src_System_Net_CookieException.cs
new file mode 100644
index 0000000..96f09e5
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.Primitives_src_System_Net_CookieException.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Net.Primitives/src/System/Net/CookieException.cs.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Net.Primitives/src/System/Net/CookieException.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Diagnostics.CodeAnalysis;
+-
+ // The NETNative_SystemNetHttp #define is used in some source files to indicate we are compiling classes
+ // directly into the .NET Native System.Net.Http.dll implementation assembly in order to use internal class
+ // methods. Internal methods are needed in order to map cookie response headers from the WinRT Windows.Web.Http APIs.
diff --git a/corefx-git/patches/patch-src_System.Net.Primitives_src_System_Net_SecureProtocols_SslEnumTypes.cs b/corefx-git/patches/patch-src_System.Net.Primitives_src_System_Net_SecureProtocols_SslEnumTypes.cs
new file mode 100644
index 0000000..2656942
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.Primitives_src_System_Net_SecureProtocols_SslEnumTypes.cs
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Net.Primitives/src/System/Net/SecureProtocols/SslEnumTypes.cs.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Net.Primitives/src/System/Net/SecureProtocols/SslEnumTypes.cs
+@@ -2,7 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Diagnostics.CodeAnalysis;
+ using System.Net;
+ using System.Runtime.InteropServices;
+ 
diff --git a/corefx-git/patches/patch-src_System.Net.Requests_src_System_Net_WebResponse.cs b/corefx-git/patches/patch-src_System.Net.Requests_src_System_Net_WebResponse.cs
new file mode 100644
index 0000000..20198dd
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.Requests_src_System_Net_WebResponse.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Net.Requests/src/System/Net/WebResponse.cs.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Net.Requests/src/System/Net/WebResponse.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Collections;
+-using System.Diagnostics.CodeAnalysis;
+ using System.Diagnostics.Contracts;
+ using System.IO;
+ 
diff --git a/corefx-git/patches/patch-src_System.Net.Sockets_System.Net.Sockets.sln b/corefx-git/patches/patch-src_System.Net.Sockets_System.Net.Sockets.sln
new file mode 100644
index 0000000..af40bd5
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.Sockets_System.Net.Sockets.sln
@@ -0,0 +1,75 @@
+$NetBSD$
+
+--- src/System.Net.Sockets/System.Net.Sockets.sln.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Net.Sockets/System.Net.Sockets.sln
+@@ -1,7 +1,7 @@
+ 
+ Microsoft Visual Studio Solution File, Format Version 12.00
+ # Visual Studio 14
+-VisualStudioVersion = 14.0.23107.0
++VisualStudioVersion = 14.0.24720.0
+ MinimumVisualStudioVersion = 10.0.40219.1
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{89BE5448-6E11-4ABC-87C6-988225002CB3}"
+ EndProject
+@@ -57,10 +57,10 @@ Global
+ 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Windows_Release|Any CPU.Build.0 = Debug|Any CPU
+ 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
+ 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
+-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.FreeBSD_Debug|Any CPU.ActiveCfg = FreeBSD_Debug|Any CPU
+-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.FreeBSD_Debug|Any CPU.Build.0 = FreeBSD_Debug|Any CPU
+-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.FreeBSD_Release|Any CPU.ActiveCfg = FreeBSD_Release|Any CPU
+-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.FreeBSD_Release|Any CPU.Build.0 = FreeBSD_Release|Any CPU
++		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.FreeBSD_Debug|Any CPU.ActiveCfg = net46_Release|Any CPU
++		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.FreeBSD_Debug|Any CPU.Build.0 = net46_Release|Any CPU
++		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.FreeBSD_Release|Any CPU.ActiveCfg = net46_Release|Any CPU
++		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.FreeBSD_Release|Any CPU.Build.0 = net46_Release|Any CPU
+ 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU
+ 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU
+ 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU
+@@ -95,26 +95,26 @@ Global
+ 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU
+ 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Windows_Release|Any CPU.Build.0 = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.FreeBSD_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.FreeBSD_Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.FreeBSD_Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.FreeBSD_Release|Any CPU.Build.0 = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Linux_Release|Any CPU.Build.0 = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.OSX_Release|Any CPU.Build.0 = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Release|Any CPU.Build.0 = Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.FreeBSD_Debug|Any CPU.ActiveCfg = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.FreeBSD_Debug|Any CPU.Build.0 = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.FreeBSD_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.FreeBSD_Release|Any CPU.Build.0 = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Linux_Debug|Any CPU.ActiveCfg = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Linux_Debug|Any CPU.Build.0 = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Linux_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Linux_Release|Any CPU.Build.0 = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.OSX_Debug|Any CPU.ActiveCfg = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.OSX_Debug|Any CPU.Build.0 = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.OSX_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.OSX_Release|Any CPU.Build.0 = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
++		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
+ 	EndGlobalSection
+ 	GlobalSection(SolutionProperties) = preSolution
+ 		HideSolutionNode = FALSE
diff --git a/corefx-git/patches/patch-src_System.Net.Sockets_src_System_Net_Sockets_UDPClient.cs b/corefx-git/patches/patch-src_System.Net.Sockets_src_System_Net_Sockets_UDPClient.cs
new file mode 100644
index 0000000..a542a07
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.Sockets_src_System_Net_Sockets_UDPClient.cs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs.orig	2016-02-25 00:30:19.953274836 +0000
++++ src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs
+@@ -2,9 +2,7 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Threading;
+ using System.Threading.Tasks;
+-using System.Diagnostics.CodeAnalysis;
+ 
+ namespace System.Net.Sockets
+ {
diff --git a/corefx-git/patches/patch-src_System.Net.Sockets_src_System_Net_Sockets_UdpReceiveResult.cs b/corefx-git/patches/patch-src_System.Net.Sockets_src_System_Net_Sockets_UdpReceiveResult.cs
new file mode 100644
index 0000000..52b4104
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.Sockets_src_System_Net_Sockets_UdpReceiveResult.cs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/System.Net.Sockets/src/System/Net/Sockets/UdpReceiveResult.cs.orig	2016-02-25 00:30:19.953313601 +0000
++++ src/System.Net.Sockets/src/System/Net/Sockets/UdpReceiveResult.cs
+@@ -2,8 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System.Diagnostics.CodeAnalysis;
+-
+ namespace System.Net.Sockets
+ {
+     public struct UdpReceiveResult : IEquatable<UdpReceiveResult>
diff --git a/corefx-git/patches/patch-src_System.Net.WebSockets.Client_src_System.Net.WebSockets.Client.csproj b/corefx-git/patches/patch-src_System.Net.WebSockets.Client_src_System.Net.WebSockets.Client.csproj
new file mode 100644
index 0000000..096857c
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Net.WebSockets.Client_src_System.Net.WebSockets.Client.csproj
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj.orig	2016-02-25 00:30:19.954540313 +0000
++++ src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
+@@ -126,6 +126,10 @@
+     <TargetingPackReference Include="System" />
+   </ItemGroup>
+ 
++  <ItemGroup Condition="'$(TargetGroup)' == 'netcore50'">
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
++  </ItemGroup>
++
+   <ItemGroup>
+     <None Include="project.json" />
+   </ItemGroup>
diff --git a/corefx-git/patches/patch-src_System.Runtime.Extensions_src_System.Runtime.Extensions.csproj b/corefx-git/patches/patch-src_System.Runtime.Extensions_src_System.Runtime.Extensions.csproj
new file mode 100644
index 0000000..4e11bcc
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Runtime.Extensions_src_System.Runtime.Extensions.csproj
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+@@ -188,6 +188,7 @@
+     <TargetingPackReference Include="System.Private.CoreLib.InteropServices" />
+     <TargetingPackReference Include="System.Private.Interop" />
+     <TargetingPackReference Include="System.Private.Threading" />
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
+     <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
+     <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" />
+   </ItemGroup>
diff --git a/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_ref_project.json b/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_ref_project.json
new file mode 100644
index 0000000..697836d
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_ref_project.json
@@ -0,0 +1,11 @@
+$NetBSD$
+
+--- src/System.Runtime.WindowsRuntime/ref/project.json.orig	2016-02-25 00:30:19.978834932 +0000
++++ src/System.Runtime.WindowsRuntime/ref/project.json
+@@ -1,6 +1,5 @@
+ {
+   "dependencies": {
+-    "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
+     "Microsoft.TargetingPack.Private.WinRT": "1.0.1",
+     "System.Runtime": "4.0.0",
+     "System.IO": "4.0.0",
diff --git a/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_src_System.Runtime.WindowsRuntime.csproj b/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_src_System.Runtime.WindowsRuntime.csproj
new file mode 100644
index 0000000..71df9d3
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_src_System.Runtime.WindowsRuntime.csproj
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj.orig	2016-02-25 00:30:19.978865618 +0000
++++ src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+@@ -28,6 +28,7 @@
+     <TargetingPackReference Include="System.Private.Interop.Extensions"/>
+     <TargetingPackReference Include="System.Private.Threading.AsyncCausalitySupport"/>
+     <TargetingPackReference Include="Windows" />
++    <ProjectReference Include="$(SourceDir)/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj" />
+   </ItemGroup>
+   <ItemGroup Condition="'$(TargetGroup)'==''">
+     <TargetingPackReference Include="mscorlib"/>
diff --git a/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_src_project.json b/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_src_project.json
new file mode 100644
index 0000000..0afa2ce
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Runtime.WindowsRuntime_src_project.json
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- src/System.Runtime.WindowsRuntime/src/project.json.orig	2016-02-25 00:30:19.980815163 +0000
++++ src/System.Runtime.WindowsRuntime/src/project.json
+@@ -5,6 +5,25 @@
+         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23818",
+         "Microsoft.TargetingPack.Private.WinRT": "1.0.1"
+       }
++    },
++    "netcore50": {
++      "dependencies": {
++        "Microsoft.TargetingPack.Private.NetNative": "1.0.0-rc3-23818",
++        "Microsoft.TargetingPack.Private.WinRT": "1.0.1",
++        "System.Collections": "4.0.0",
++        "System.Diagnostics.Debug": "4.0.10",
++        "System.Dynamic.Runtime": "4.0.10",
++        "System.Globalization": "4.0.0",
++        "System.IO": "4.0.10",
++        "System.Reflection": "4.0.0",
++        "System.Resources.ResourceManager": "4.0.0",
++        "System.Runtime": "4.0.20",
++        "System.Runtime.Extensions": "4.0.0",
++        "System.Runtime.InteropServices": "4.0.20",
++        "System.Runtime.InteropServices.WindowsRuntime": "4.0.0",
++        "System.Threading": "4.0.10.0",
++        "System.Threading.Tasks": "4.0.10.0"
++      }
+     }
+   }
+ }
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Create.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Create.cs
new file mode 100644
index 0000000..dbfd6bf
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Create.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Create.cs.orig	2016-02-25 00:30:19.987564739 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Create.cs
+@@ -2,10 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-
+ using Microsoft.Win32.SafeHandles;
+ 
+ using Internal.Cryptography;
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Delete.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Delete.cs
new file mode 100644
index 0000000..b25b59f
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Delete.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Delete.cs.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Delete.cs
+@@ -2,12 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-
+-using Microsoft.Win32.SafeHandles;
+-
+ using Internal.Cryptography;
+ 
+ using ErrorCode = Interop.NCrypt.ErrorCode;
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Exists.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Exists.cs
new file mode 100644
index 0000000..ebfa99c
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Exists.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Exists.cs.orig	2016-02-25 00:30:19.987609382 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Exists.cs
+@@ -2,10 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-
+ using Microsoft.Win32.SafeHandles;
+ 
+ using Internal.Cryptography;
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Export.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Export.cs
new file mode 100644
index 0000000..a66ee22
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Export.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Export.cs.orig	2016-02-25 00:30:19.987655729 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Export.cs
+@@ -2,12 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-
+-using Microsoft.Win32.SafeHandles;
+-
+ using Internal.Cryptography;
+ 
+ using ErrorCode = Interop.NCrypt.ErrorCode;
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Import.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Import.cs
new file mode 100644
index 0000000..9e4cc52
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Import.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Import.cs.orig	2016-02-25 00:30:19.987699300 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Import.cs
+@@ -2,10 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-
+ using Microsoft.Win32.SafeHandles;
+ 
+ using Internal.Cryptography;
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Open.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Open.cs
new file mode 100644
index 0000000..50e8022
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Open.cs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Open.cs.orig	2016-02-25 00:30:19.987743096 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Open.cs
+@@ -2,10 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-
+ using Microsoft.Win32.SafeHandles;
+ 
+ using Internal.Cryptography;
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.OpenHandle.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.OpenHandle.cs
new file mode 100644
index 0000000..c8e0337
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.OpenHandle.cs
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.OpenHandle.cs.orig	2016-02-25 00:30:19.987795521 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.OpenHandle.cs
+@@ -2,16 +2,10 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-
+ using Microsoft.Win32.SafeHandles;
+ 
+ using Internal.Cryptography;
+ 
+-using ErrorCode = Interop.NCrypt.ErrorCode;
+-
+ namespace System.Security.Cryptography
+ {
+     /// <summary>
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Properties.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Properties.cs
new file mode 100644
index 0000000..1429ee1
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.Properties.cs
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Properties.cs.orig	2016-02-25 00:30:19.987840125 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.Properties.cs
+@@ -2,12 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+-
+-using Microsoft.Win32.SafeHandles;
+-
+ using Internal.Cryptography;
+ 
+ using ErrorCode = Interop.NCrypt.ErrorCode;
diff --git a/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.StandardProperties.cs b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.StandardProperties.cs
new file mode 100644
index 0000000..9e03ac1
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Security.Cryptography.Cng_src_System_Security_Cryptography_CngKey.StandardProperties.cs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.StandardProperties.cs.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Security.Cryptography.Cng/src/System/Security/Cryptography/CngKey.StandardProperties.cs
+@@ -2,9 +2,6 @@
+ // The .NET Foundation licenses this file to you under the MIT license.
+ // See the LICENSE file in the project root for more information.
+ 
+-using System;
+-using System.Diagnostics;
+-using System.Diagnostics.Contracts;
+ using System.Runtime.InteropServices;
+ 
+ using Microsoft.Win32.SafeHandles;
diff --git a/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_Internal_TargetCore.cs b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_Internal_TargetCore.cs
new file mode 100644
index 0000000..087ece3
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_Internal_TargetCore.cs
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/System.Threading.Tasks.Dataflow/src/Internal/TargetCore.cs.orig	2016-02-25 00:30:20.005981592 +0000
++++ src/System.Threading.Tasks.Dataflow/src/Internal/TargetCore.cs
+@@ -11,13 +11,11 @@
+ //
+ // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+ 
+-using System.Collections.Concurrent;
+ using System.Collections.Generic;
+ using System.Diagnostics;
+ using System.Diagnostics.CodeAnalysis;
+ using System.Diagnostics.Contracts;
+ using System.Linq;
+-using System.Security;
+ 
+ namespace System.Threading.Tasks.Dataflow.Internal
+ {
diff --git a/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.WP8.csproj b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.WP8.csproj
new file mode 100644
index 0000000..ab31ef5
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.WP8.csproj
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.WP8.csproj.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.WP8.csproj
+@@ -3,22 +3,17 @@
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{0C10C503-FD37-4990-BD0F-B79FE22203DD}</ProjectGuid>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>System.Threading.Tasks.Dataflow</RootNamespace>
+     <AssemblyName>System.Threading.Tasks.Dataflow</AssemblyName>
+     <AssemblyVersion>4.6.0.0</AssemblyVersion>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
+-    <FileAlignment>512</FileAlignment>
+     <DocumentationFile>$(OutputPath)System.Threading.Tasks.Dataflow.XML</DocumentationFile>
+-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+     <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
++    <ProjectJson>wp8/project.json</ProjectJson>
++    <ProjectLockJson>wp8/project.lock.json</ProjectLockJson>
+   </PropertyGroup>
+   <!-- Default configurations to help VS understand the configurations -->
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+-  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <Compile Include="Base\DataflowBlock.cs" />
+     <Compile Include="Base\DataflowBlockOptions.cs" />
diff --git a/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.csproj b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.csproj
new file mode 100644
index 0000000..2029390
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_System.Threading.Tasks.Dataflow.csproj
@@ -0,0 +1,43 @@
+$NetBSD$
+
+--- src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj.orig	2016-02-10 10:03:58.000000000 +0000
++++ src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
+@@ -3,15 +3,10 @@
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+     <ProjectGuid>{1DD0FF15-6234-4BD6-850A-317F05479554}</ProjectGuid>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>System.Threading.Tasks.Dataflow</RootNamespace>
+     <AssemblyName>System.Threading.Tasks.Dataflow</AssemblyName>
+     <AssemblyVersion>4.6.0.0</AssemblyVersion>
+-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+-    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+-    <FileAlignment>512</FileAlignment>
+     <DocumentationFile>$(OutputPath)System.Threading.Tasks.Dataflow.XML</DocumentationFile>
+-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+     <DefineConstants>$(DefineConstants);CONCURRENT_COLLECTIONS;FEATURE_TRACING</DefineConstants>
+   </PropertyGroup>
+   <ItemGroup>
+@@ -24,10 +19,8 @@
+     </PackageDestination>
+   </ItemGroup>
+   <!-- Default configurations to help VS understand the configurations -->
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+-  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <Compile Include="Base\DataflowBlock.cs" />
+     <Compile Include="Base\DataflowBlockOptions.cs" />
+@@ -68,8 +61,7 @@
+     <None Include="XmlDocs\CommonXmlDocComments.xml" />
+   </ItemGroup>
+   <ItemGroup>
+-    <Content Include="XmlDocs\System.Threading.Tasks.Dataflow.xml">
+-    </Content>
++    <Content Include="XmlDocs\System.Threading.Tasks.Dataflow.xml" />
+   </ItemGroup>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+ </Project>
diff --git a/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_project.json b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_project.json
new file mode 100644
index 0000000..89c6510
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_project.json
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- src/System.Threading.Tasks.Dataflow/src/project.json.orig	2016-02-25 00:30:49.142436607 +0000
++++ src/System.Threading.Tasks.Dataflow/src/project.json
+@@ -0,0 +1,22 @@
++{
++  "frameworks": {
++    "dnxcore50": {
++      "dependencies": {
++        "System.Collections": "4.0.0",
++        "System.Collections.Concurrent": "4.0.0",
++        "System.Diagnostics.Contracts": "4.0.0",
++        "System.Diagnostics.Debug": "4.0.0",
++        "System.Diagnostics.Tools": "4.0.0",
++        "System.Diagnostics.Tracing": "4.0.0",
++        "System.Dynamic.Runtime": "4.0.0",
++        "System.Linq": "4.0.0",
++        "System.Resources.ResourceManager": "4.0.0",
++        "System.Runtime": "4.0.0",
++        "System.Runtime.Extensions": "4.0.0",
++        "System.Runtime.Serialization.Primitives": "4.0.0",
++        "System.Threading": "4.0.0",
++        "System.Threading.Tasks": "4.0.0",
++      }
++    }
++  }
++}
diff --git a/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_wp8_project.json b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_wp8_project.json
new file mode 100644
index 0000000..23c338d
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_src_wp8_project.json
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- src/System.Threading.Tasks.Dataflow/src/wp8/project.json.orig	2016-02-25 00:30:49.142506502 +0000
++++ src/System.Threading.Tasks.Dataflow/src/wp8/project.json
+@@ -0,0 +1,20 @@
++{
++  "frameworks": {
++    "dnxcore50": {
++      "dependencies": {
++        "System.Collections": "4.0.0",
++        "System.Diagnostics.Contracts": "4.0.0",
++        "System.Diagnostics.Debug": "4.0.0",
++        "System.Diagnostics.Tools": "4.0.0",
++        "System.Dynamic.Runtime": "4.0.0",
++        "System.Linq": "4.0.0",
++        "System.Resources.ResourceManager": "4.0.0",
++        "System.Runtime": "4.0.0",
++        "System.Runtime.Extensions": "4.0.0",
++        "System.Runtime.Serialization.Primitives": "4.0.0",
++        "System.Threading": "4.0.0",
++        "System.Threading.Tasks": "4.0.0",
++      }
++    }
++  }
++}
diff --git a/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_tests_System.Threading.Tasks.Dataflow.Tests.csproj b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_tests_System.Threading.Tasks.Dataflow.Tests.csproj
new file mode 100644
index 0000000..0f6a8ab
--- /dev/null
+++ b/corefx-git/patches/patch-src_System.Threading.Tasks.Dataflow_tests_System.Threading.Tasks.Dataflow.Tests.csproj
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj.orig	2016-01-30 00:21:00.000000000 +0000
++++ src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj
+@@ -2,20 +2,12 @@
+ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <PropertyGroup>
+-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+     <ProjectGuid>{72E21903-0FBA-444E-9855-3B4F05DFC1F9}</ProjectGuid>
+-    <OutputType>Library</OutputType>
+-    <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>System.Threading.Tasks.Dataflow.Tests</RootNamespace>
+     <AssemblyName>System.Threading.Tasks.Dataflow.Tests</AssemblyName>
+-    <FileAlignment>512</FileAlignment>
+-    <NuGetPackageImportStamp>bcca2a00</NuGetPackageImportStamp>
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+-  </PropertyGroup>
+-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+   </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
+   <ItemGroup>
+     <Compile Include="Dataflow\*.cs" />
+     <Compile Include="$(CommonTestPath)\System\Diagnostics\Tracing\TestEventListener.cs">
diff --git a/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_TypeForwards.cs b/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_TypeForwards.cs
new file mode 100644
index 0000000..9de5927
--- /dev/null
+++ b/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_TypeForwards.cs
@@ -0,0 +1,38 @@
+$NetBSD$
+
+--- src/mscorlib.WinRT-Facade/TypeForwards.cs.orig	2016-02-25 00:30:49.145850909 +0000
++++ src/mscorlib.WinRT-Facade/TypeForwards.cs
+@@ -0,0 +1,33 @@
++// Licensed to the .NET Foundation under one or more agreements.
++// The .NET Foundation licenses this file to you under the MIT license.
++// See the LICENSE file in the project root for more information.
++
++using System.Runtime.CompilerServices;
++
++// The following types are can be referenced by windows.winmd and are spec'ed to come from mscorlib
++[assembly: TypeForwardedTo(typeof(System.Attribute))]
++[assembly: TypeForwardedTo(typeof(System.Boolean))]
++[assembly: TypeForwardedTo(typeof(System.Byte))]
++[assembly: TypeForwardedTo(typeof(System.Char))]
++[assembly: TypeForwardedTo(typeof(System.Double))]
++[assembly: TypeForwardedTo(typeof(System.Enum))]
++[assembly: TypeForwardedTo(typeof(System.FlagsAttribute))]
++[assembly: TypeForwardedTo(typeof(System.Guid))]
++[assembly: TypeForwardedTo(typeof(System.Int16))]
++[assembly: TypeForwardedTo(typeof(System.Int32))]
++[assembly: TypeForwardedTo(typeof(System.Int64))]
++[assembly: TypeForwardedTo(typeof(System.IntPtr))]
++[assembly: TypeForwardedTo(typeof(System.MulticastDelegate))]
++[assembly: TypeForwardedTo(typeof(System.Object))]
++[assembly: TypeForwardedTo(typeof(System.Runtime.CompilerServices.IsConst))]
++[assembly: TypeForwardedTo(typeof(System.Single))]
++[assembly: TypeForwardedTo(typeof(System.String))]
++[assembly: TypeForwardedTo(typeof(System.Type))]
++[assembly: TypeForwardedTo(typeof(System.UInt16))]
++[assembly: TypeForwardedTo(typeof(System.UInt32))]
++[assembly: TypeForwardedTo(typeof(System.UInt64))]
++[assembly: TypeForwardedTo(typeof(System.ValueType))]
++[assembly: TypeForwardedTo(typeof(void))] // System.Void
++
++// XAML compiler is checking for the following
++[assembly: TypeForwardedTo(typeof(System.Array))]
diff --git a/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.builds b/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.builds
new file mode 100644
index 0000000..4e16bce
--- /dev/null
+++ b/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.builds
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds.orig	2016-02-25 00:30:49.145904896 +0000
++++ src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
++  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
++  <ItemGroup>
++    <Project Include="mscorlib.WinRT-Facade.csproj" />
++  </ItemGroup>
++  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
++</Project>
++
diff --git a/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.csproj b/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.csproj
new file mode 100644
index 0000000..b0bacc7
--- /dev/null
+++ b/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_mscorlib.WinRT-Facade.csproj
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj.orig	2016-02-25 00:30:49.145961307 +0000
++++ src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj
+@@ -0,0 +1,18 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
++  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
++  <PropertyGroup>
++    <AssemblyName>mscorlib</AssemblyName>
++    <AssemblyVersion>4.0.0.0</AssemblyVersion>
++  </PropertyGroup>
++  <!-- Default configurations to help VS understand the configurations -->
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
++  <ItemGroup>
++    <Compile Include="TypeForwards.cs" />
++  </ItemGroup>
++  <ItemGroup>
++    <None Include="project.json" />
++  </ItemGroup>
++  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
++</Project>
diff --git a/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_project.json b/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_project.json
new file mode 100644
index 0000000..d13cf5f
--- /dev/null
+++ b/corefx-git/patches/patch-src_mscorlib.WinRT-Facade_project.json
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/mscorlib.WinRT-Facade/project.json.orig	2016-02-25 00:30:49.146016511 +0000
++++ src/mscorlib.WinRT-Facade/project.json
+@@ -0,0 +1,9 @@
++{
++  "frameworks": {
++    "dnxcore50": {
++      "dependencies": {
++        "System.Runtime": "4.0.20",
++      },
++    }
++  }
++}
+\ No newline at end of file


Home | Main Index | Thread Index | Old Index