diff options
author | Eric Mellino <erme@microsoft.com> | 2016-02-06 04:29:17 +0300 |
---|---|---|
committer | Eric Mellino <erme@microsoft.com> | 2016-02-25 05:29:17 +0300 |
commit | e49f570bf97d0d81f3c461970155dc6cdd6aee8c (patch) | |
tree | e29ea4b951397495b22b921e31f93fdf4d1f84bf /src | |
parent | 70e4e0df4370803cb63b68fc9a6189c3f3c59f80 (diff) |
Fix compilation issues in various libraries when compiling without PCL reference assemblies
Diffstat (limited to 'src')
33 files changed, 117 insertions, 107 deletions
diff --git a/src/Common/src/System/IO/PathInternal.cs b/src/Common/src/System/IO/PathInternal.cs index 057429825d..636ebfd467 100644 --- a/src/Common/src/System/IO/PathInternal.cs +++ b/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/src/Common/src/System/Net/ContextAwareResult.cs b/src/Common/src/System/Net/ContextAwareResult.cs index b0289b5f56..f84c74caaa 100644 --- a/src/Common/src/System/Net/ContextAwareResult.cs +++ b/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/src/Common/src/System/Net/DebugCriticalHandleMinusOneIsInvalid.cs b/src/Common/src/System/Net/DebugCriticalHandleMinusOneIsInvalid.cs index a468277d69..2844cd8279 100644 --- a/src/Common/src/System/Net/DebugCriticalHandleMinusOneIsInvalid.cs +++ b/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/src/Common/src/System/Net/DebugCriticalHandleZeroOrMinusOneIsInvalid.cs b/src/Common/src/System/Net/DebugCriticalHandleZeroOrMinusOneIsInvalid.cs index fdb0cd2f13..ff376bf467 100644 --- a/src/Common/src/System/Net/DebugCriticalHandleZeroOrMinusOneIsInvalid.cs +++ b/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/src/Common/src/System/Net/DebugSafeHandle.cs b/src/Common/src/System/Net/DebugSafeHandle.cs index 518f158336..bf9f494a8d 100644 --- a/src/Common/src/System/Net/DebugSafeHandle.cs +++ b/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/src/Common/src/System/Net/DebugSafeHandleMinusOneIsInvalid.cs b/src/Common/src/System/Net/DebugSafeHandleMinusOneIsInvalid.cs index c21116a6ed..000d613ea9 100644 --- a/src/Common/src/System/Net/DebugSafeHandleMinusOneIsInvalid.cs +++ b/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/src/Common/src/System/Net/Logging/LoggingHash.cs b/src/Common/src/System/Net/Logging/LoggingHash.cs index 82778533d4..6db153ed76 100644 --- a/src/Common/src/System/Net/Logging/LoggingHash.cs +++ b/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/src/Common/src/System/Net/NetworkInformation/HostInformationPal.NetNative.cs b/src/Common/src/System/Net/NetworkInformation/HostInformationPal.NetNative.cs index 3c061947de..d124f49078 100644 --- a/src/Common/src/System/Net/NetworkInformation/HostInformationPal.NetNative.cs +++ b/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/src/System.AppContext/src/System.AppContext.csproj b/src/System.AppContext/src/System.AppContext.csproj index 4da3469168..6fe4e7950f 100644 --- a/src/System.AppContext/src/System.AppContext.csproj +++ b/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/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/ActivityTracker.cs b/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/ActivityTracker.cs index a011993066..69ea8118ea 100644 --- a/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/ActivityTracker.cs +++ b/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/ActivityTracker.cs @@ -14,7 +14,6 @@ using Contract = Microsoft.Diagnostics.Contracts.Internal.Contract; #if ES_BUILD_STANDALONE namespace Microsoft.Diagnostics.Tracing #else -using System.Threading.Tasks; namespace System.Diagnostics.Tracing #endif { diff --git a/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSource.cs b/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSource.cs index 2770b6edf8..464f00525e 100644 --- a/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSource.cs +++ b/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/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSourceException.cs b/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSourceException.cs index 3fc9d545b8..6804398dd2 100644 --- a/src/System.Diagnostics.Tracing/src/System/Diagnostics/Tracing/EventSourceException.cs +++ b/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/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 260f69ef81..389d10c2c8 100644 --- a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/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/src/System.IO.FileSystem/src/System/IO/WinRTFileSystem.cs b/src/System.IO.FileSystem/src/System/IO/WinRTFileSystem.cs index cdc22dbede..e0600dac20 100644 --- a/src/System.IO.FileSystem/src/System/IO/WinRTFileSystem.cs +++ b/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/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 721f557989..f4ebf5b6ad 100644 --- a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/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/src/System.Net.Http/src/System.Net.Http.csproj b/src/System.Net.Http/src/System.Net.Http.csproj index 9dd3b84d05..24a048c4eb 100644 --- a/src/System.Net.Http/src/System.Net.Http.csproj +++ b/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/src/System.Net.NameResolution/System.Net.NameResolution.sln b/src/System.Net.NameResolution/System.Net.NameResolution.sln index be17e2e3dc..b0f3c24873 100644 --- a/src/System.Net.NameResolution/System.Net.NameResolution.sln +++ b/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-1A3956D46DE8}") = "PalTests", "PalTests", "{B4 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/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 6187529dec..678fec435f 100644 --- a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/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/src/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/System.Net.Primitives/src/System.Net.Primitives.csproj index 51fb3f86be..23e5460797 100644 --- a/src/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/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/src/System.Net.Primitives/src/System/Net/CookieException.cs b/src/System.Net.Primitives/src/System/Net/CookieException.cs index 89a8dadedd..fcec9005f5 100644 --- a/src/System.Net.Primitives/src/System/Net/CookieException.cs +++ b/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/src/System.Net.Primitives/src/System/Net/SecureProtocols/SslEnumTypes.cs b/src/System.Net.Primitives/src/System/Net/SecureProtocols/SslEnumTypes.cs index d686f2f2b5..2f257e6d8f 100644 --- a/src/System.Net.Primitives/src/System/Net/SecureProtocols/SslEnumTypes.cs +++ b/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/src/System.Net.Requests/src/System/Net/WebResponse.cs b/src/System.Net.Requests/src/System/Net/WebResponse.cs index 2a8a74ea88..278208d03c 100644 --- a/src/System.Net.Requests/src/System/Net/WebResponse.cs +++ b/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/src/System.Net.Sockets/System.Net.Sockets.sln b/src/System.Net.Sockets/System.Net.Sockets.sln index 8718b656f1..adc57d3722 100644 --- a/src/System.Net.Sockets/System.Net.Sockets.sln +++ b/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/src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs b/src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs index 4fb23693bd..29f56c0ca3 100644 --- a/src/System.Net.Sockets/src/System/Net/Sockets/UDPClient.cs +++ b/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/src/System.Net.Sockets/src/System/Net/Sockets/UdpReceiveResult.cs b/src/System.Net.Sockets/src/System/Net/Sockets/UdpReceiveResult.cs index 6c633908ba..14babeca6a 100644 --- a/src/System.Net.Sockets/src/System/Net/Sockets/UdpReceiveResult.cs +++ b/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/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj index 0d283f7b06..2e280e9c08 100644 --- a/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj +++ b/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/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index bec26d0409..21b5ef1388 100644 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/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/src/System.Runtime.WindowsRuntime/ref/project.json b/src/System.Runtime.WindowsRuntime/ref/project.json index 479f26e0f0..ede7ae89d8 100644 --- a/src/System.Runtime.WindowsRuntime/ref/project.json +++ b/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/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj index 1b6fa37290..b05d250c68 100644 --- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj +++ b/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"/> @@ -99,4 +100,4 @@ <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/mscorlib.WinRT-Facade/TypeForwards.cs b/src/mscorlib.WinRT-Facade/TypeForwards.cs new file mode 100644 index 0000000000..64b6f38f81 --- /dev/null +++ b/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/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds b/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds new file mode 100644 index 0000000000..a368692b96 --- /dev/null +++ b/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/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj b/src/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.csproj new file mode 100644 index 0000000000..105ca88457 --- /dev/null +++ b/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/src/mscorlib.WinRT-Facade/project.json b/src/mscorlib.WinRT-Facade/project.json new file mode 100644 index 0000000000..b36c859026 --- /dev/null +++ b/src/mscorlib.WinRT-Facade/project.json @@ -0,0 +1,9 @@ +{ + "frameworks": { + "dnxcore50": { + "dependencies": { + "System.Runtime": "4.0.20", + }, + } + } +}
\ No newline at end of file |