diff options
49 files changed, 159 insertions, 255 deletions
diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index fb6df820c9..ca6ca60256 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -882,7 +882,7 @@ "4.0.0.0": "4.0.0", "4.0.10.0": "4.0.10", "4.0.11.0": "4.0.11", - "4.0.12.0": "4.3.0" + "4.1.0.0": "4.3.0" } }, "System.ComponentModel.Primitives": { @@ -997,7 +997,7 @@ "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.1.0", "4.1.0.0": "4.1.0", - "4.1.1.0": "4.3.0" + "4.2.0.0": "4.3.0" } }, "System.Diagnostics.StackTrace": { diff --git a/src/System.ComponentModel.EventBasedAsync/dir.props b/src/System.ComponentModel.EventBasedAsync/dir.props index d16ef39bdb..0769c12aaa 100644 --- a/src/System.ComponentModel.EventBasedAsync/dir.props +++ b/src/System.ComponentModel.EventBasedAsync/dir.props @@ -1,7 +1,7 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.0.12.0</AssemblyVersion> + <AssemblyVersion>4.1.0.0</AssemblyVersion> </PropertyGroup> </Project> diff --git a/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj b/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj index 55a184ecf6..2830549759 100644 --- a/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj +++ b/src/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.ComponentModel.EventBasedAsync.csproj"> - <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.EventBasedAsync.builds" /> <InboxOnTargetFramework Include="MonoAndroid10" /> diff --git a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.Manual.cs b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.Manual.cs index bb67aa0df2..f32379dd30 100644 --- a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.Manual.cs +++ b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.Manual.cs @@ -7,12 +7,6 @@ namespace System.ComponentModel { - public partial class BackgroundWorker : IDisposable - { - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - } - public partial class DoWorkEventArgs : System.EventArgs { public bool Cancel { get { return false; } set { } } diff --git a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.cs b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.cs index 1db8bd5620..fb1dcbc161 100644 --- a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.cs +++ b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.cs @@ -33,7 +33,7 @@ namespace System.ComponentModel public static System.Threading.SynchronizationContext SynchronizationContext { get { return default(System.Threading.SynchronizationContext); } set { } } public static System.ComponentModel.AsyncOperation CreateOperation(object userSuppliedState) { return default(System.ComponentModel.AsyncOperation); } } - public partial class BackgroundWorker + public partial class BackgroundWorker : System.ComponentModel.Component { public BackgroundWorker() { } public bool CancellationPending { get { return default(bool); } } diff --git a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj index 69ebddea82..11304b1509 100644 --- a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj +++ b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj @@ -2,9 +2,8 @@ <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.0.10.0</AssemblyVersion> <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.ComponentModel.EventBasedAsync.cs" /> diff --git a/src/System.ComponentModel.EventBasedAsync/ref/project.json b/src/System.ComponentModel.EventBasedAsync/ref/project.json index 51a14d05dc..4b75d1a091 100644 --- a/src/System.ComponentModel.EventBasedAsync/ref/project.json +++ b/src/System.ComponentModel.EventBasedAsync/ref/project.json @@ -1,13 +1,10 @@ { "dependencies": { - "System.Runtime": "4.0.0", - "System.Threading": "4.0.0" + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", + "System.Runtime": "4.3.0-beta-24601-02", + "System.Threading": "4.3.0-beta-24601-02" }, "frameworks": { - "netstandard1.3": { - "imports": [ - "dotnet5.4" - ] - } + "netstandard1.7": { } } } diff --git a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.builds b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.builds index a49324e4fa..c29d3ad867 100644 --- a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.builds +++ b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.builds @@ -3,10 +3,9 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <Project Include="System.ComponentModel.EventBasedAsync.csproj" /> - <!-- Net46 facade is currently inbox for 4.0 <Project Include="System.ComponentModel.EventBasedAsync.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> --> + <TargetGroup>net463</TargetGroup> + </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project> diff --git a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj index 751a52d03b..df02930c1a 100644 --- a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj +++ b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj @@ -5,16 +5,15 @@ <ProjectGuid>{551A6340-8EEF-445E-A2A2-639CC23DBD36}</ProjectGuid> <RootNamespace>System.ComponentModel.EventBasedAsync</RootNamespace> <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> - <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3;netcore50</PackageTargetFramework> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="System\ComponentModel\AsyncCompletedEvent.cs" /> <Compile Include="System\ComponentModel\AsyncOperation.cs" /> <Compile Include="System\ComponentModel\AsyncOperationManager.cs" /> @@ -23,7 +22,7 @@ <Compile Include="System\ComponentModel\DoWorkEvent.cs" /> <Compile Include="System\ComponentModel\RunWorkerCompletedEvent.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> </ItemGroup> diff --git a/src/System.ComponentModel.EventBasedAsync/src/System/ComponentModel/BackgroundWorker.cs b/src/System.ComponentModel.EventBasedAsync/src/System/ComponentModel/BackgroundWorker.cs index 21fea6fabf..2a44cd902a 100644 --- a/src/System.ComponentModel.EventBasedAsync/src/System/ComponentModel/BackgroundWorker.cs +++ b/src/System.ComponentModel.EventBasedAsync/src/System/ComponentModel/BackgroundWorker.cs @@ -2,13 +2,14 @@ // 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.ComponentModel; using System.Diagnostics; using System.Threading; using System.Threading.Tasks; namespace System.ComponentModel { - public class BackgroundWorker : IDisposable + public class BackgroundWorker : Component { // Private instance members private bool _canCancelWorker = false; @@ -209,13 +210,7 @@ namespace System.ComponentModel _asyncOperation.PostOperationCompleted(_operationCompleted, e); } - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected virtual void Dispose(bool disposing) + protected override void Dispose(bool disposing) { } } diff --git a/src/System.ComponentModel.EventBasedAsync/src/project.json b/src/System.ComponentModel.EventBasedAsync/src/project.json index 3d367e3c97..2358d53b87 100644 --- a/src/System.ComponentModel.EventBasedAsync/src/project.json +++ b/src/System.ComponentModel.EventBasedAsync/src/project.json @@ -1,23 +1,21 @@ { "frameworks": { - "netstandard1.3": { + "netstandard1.7": { "dependencies": { "Microsoft.NETCore.Platforms": "1.0.1", - "System.Diagnostics.Contracts": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Threading": "4.0.10", - "System.Threading.Tasks": "4.0.10" - }, - "imports": [ - "dotnet5.4" - ] + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", + "System.Diagnostics.Contracts": "4.3.0-beta-24601-02", + "System.Diagnostics.Debug": "4.3.0-beta-24601-02", + "System.Diagnostics.Tools": "4.3.0-beta-24601-02", + "System.Resources.ResourceManager": "4.3.0-beta-24601-02", + "System.Runtime": "4.3.0-beta-24601-02", + "System.Threading": "4.3.0-beta-24601-02", + "System.Threading.Tasks": "4.3.0-beta-24601-02", + } }, - "net46": { + "net463": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" + "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" } } } diff --git a/src/System.Diagnostics.Process/dir.props b/src/System.Diagnostics.Process/dir.props index 34b2edfd20..ec6b27dedd 100644 --- a/src/System.Diagnostics.Process/dir.props +++ b/src/System.Diagnostics.Process/dir.props @@ -1,7 +1,7 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.1.1.0</AssemblyVersion> + <AssemblyVersion>4.2.0.0</AssemblyVersion> </PropertyGroup> </Project> diff --git a/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj b/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj index 7b832bb5b4..5131f91478 100644 --- a/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj +++ b/src/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj @@ -3,7 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.Diagnostics.Process.csproj"> - <SupportedFramework>net461;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Diagnostics.Process.builds" /> </ItemGroup> diff --git a/src/System.Diagnostics.Process/ref/4.0/System.Diagnostics.Process.depproj b/src/System.Diagnostics.Process/ref/4.0/System.Diagnostics.Process.depproj deleted file mode 100644 index 1681b96d7d..0000000000 --- a/src/System.Diagnostics.Process/ref/4.0/System.Diagnostics.Process.depproj +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Process/ref/4.0/project.json b/src/System.Diagnostics.Process/ref/4.0/project.json deleted file mode 100644 index eb9f95916d..0000000000 --- a/src/System.Diagnostics.Process/ref/4.0/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Diagnostics.Process": "4.1.0" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.Manual.cs b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.Manual.cs index 892da50d51..7e8e19f841 100644 --- a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.Manual.cs +++ b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.Manual.cs @@ -7,11 +7,6 @@ namespace System.Diagnostics { - public partial class Process : System.IDisposable - { - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - } public partial class ProcessModuleCollection : System.Collections.ICollection { public int Count { get { return default(int); } } diff --git a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs index 0ce627a645..e0ded1e6c7 100644 --- a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs +++ b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.cs @@ -22,7 +22,7 @@ namespace System.Diagnostics public string Data { get { return default(string); } } } public delegate void DataReceivedEventHandler(object sender, System.Diagnostics.DataReceivedEventArgs e); - public partial class Process + public partial class Process : System.ComponentModel.Component { public Process() { } public int BasePriority { get { return default(int); } } @@ -87,7 +87,7 @@ namespace System.Diagnostics public void WaitForExit() { } public bool WaitForExit(int milliseconds) { return default(bool); } } - public partial class ProcessModule + public partial class ProcessModule : System.ComponentModel.Component { internal ProcessModule() { } public System.IntPtr BaseAddress { get { return default(System.IntPtr); } } @@ -136,7 +136,7 @@ namespace System.Diagnostics public bool UseShellExecute { get { return default(bool); } set { } } public string WorkingDirectory { get { return default(string); } set { } } } - public partial class ProcessThread + public partial class ProcessThread : System.ComponentModel.Component { internal ProcessThread() { } public int BasePriority { get { return default(int); } } diff --git a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj index b6b4c3c148..2a1f7cea6a 100644 --- a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj @@ -4,7 +4,7 @@ <PropertyGroup> <OutputType>Library</OutputType> <!-- requires 5.5 since we needed surface area in Desktop 4.6.1 to support --> - <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker> + <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Diagnostics.Process.cs" /> diff --git a/src/System.Diagnostics.Process/ref/project.json b/src/System.Diagnostics.Process/ref/project.json index 18833ac7cd..4a31937268 100644 --- a/src/System.Diagnostics.Process/ref/project.json +++ b/src/System.Diagnostics.Process/ref/project.json @@ -1,15 +1,12 @@ { "dependencies": { - "System.Runtime": "4.0.0", - "System.Runtime.Handles": "4.0.0", - "System.IO": "4.0.0", - "System.Text.Encoding": "4.0.0" + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", + "System.Runtime": "4.3.0-beta-24601-02", + "System.Runtime.Handles": "4.3.0-beta-24601-02", + "System.IO": "4.3.0-beta-24601-02", + "System.Text.Encoding": "4.3.0-beta-24601-02", }, "frameworks": { - "netstandard1.4": { - "imports": [ - "dotnet5.5" - ] - } + "netstandard1.7": { } } } diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.builds b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.builds index cd3098cadf..34b7a8ecb4 100644 --- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.builds +++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.builds @@ -12,10 +12,7 @@ <OSGroup>Windows_NT</OSGroup> </Project> <Project Include="System.Diagnostics.Process.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - <Project Include="System.Diagnostics.Process.csproj"> - <TargetGroup>net461</TargetGroup> + <TargetGroup>net463</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index e1d0fbe534..f504ff5f47 100644 --- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -10,11 +10,9 @@ <ProjectGuid>{63634289-90D7-4947-8BF3-DBBE98D76C85}</ProjectGuid> <RootNamespace>System.Diagnostics.Process</RootNamespace> <AssemblyName>System.Diagnostics.Process</AssemblyName> - <AssemblyVersion Condition="'$(TargetGroup)'=='net46'">4.0.0.0</AssemblyVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ContractProject Condition="'$(AssemblyVersion)' == '4.0.0.0'">..\ref\4.0\System.Diagnostics.Process.depproj</ContractProject> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46' OR '$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.4</NuGetTargetMoniker> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net463'">true</IsPartialFacadeAssembly> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <PropertyGroup Condition=" '$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true' "> <!-- Suppress unused field warnings when using PlatformNotSupportedException stubs --> diff --git a/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs b/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs index d162d65347..bfac20bf78 100644 --- a/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs +++ b/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs @@ -4,6 +4,7 @@ using Microsoft.Win32.SafeHandles; using System.Collections.Generic; +using System.ComponentModel; using System.Globalization; using System.IO; using System.Security; @@ -18,7 +19,7 @@ namespace System.Diagnostics /// processes. Enables you to start and stop system processes. /// </para> /// </devdoc> - public partial class Process : IDisposable + public partial class Process : Component { private bool _haveProcessId; private int _processId; @@ -704,7 +705,7 @@ namespace System.Diagnostics /// Free any resources associated with this component. /// </para> /// </devdoc> - protected virtual void Dispose(bool disposing) + protected override void Dispose(bool disposing) { if (!_disposed) { @@ -1359,12 +1360,6 @@ namespace System.Diagnostics } } - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - /// <summary> /// This enum defines the operation mode for redirected process stream. /// We don't support switching between synchronous mode and asynchronous mode. diff --git a/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessModule.cs b/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessModule.cs index ac8bbc5765..055112b528 100644 --- a/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessModule.cs +++ b/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessModule.cs @@ -2,6 +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.ComponentModel; using System.Globalization; namespace System.Diagnostics @@ -11,7 +12,7 @@ namespace System.Diagnostics /// a particular process. Using this component, you can determine /// information about the module. /// </devdoc> - public class ProcessModule + public class ProcessModule : Component { private readonly ModuleInfo _moduleInfo; #if FEATURE_FILEVERSIONINFO diff --git a/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs b/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs index 6dbee6c736..d7b4f26c92 100644 --- a/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs +++ b/src/System.Diagnostics.Process/src/System/Diagnostics/ProcessThread.cs @@ -2,6 +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.ComponentModel; + namespace System.Diagnostics { /// <devdoc> @@ -11,7 +13,7 @@ namespace System.Diagnostics /// returned from the System.Diagnostics.Process.ProcessThread property of the System.Diagnostics.Process component. /// </para> /// </devdoc> - public partial class ProcessThread + public partial class ProcessThread : Component { private readonly bool _isRemoteMachine; private readonly int _processId; diff --git a/src/System.Diagnostics.Process/src/project.json b/src/System.Diagnostics.Process/src/project.json index d57b550232..451d2f535d 100644 --- a/src/System.Diagnostics.Process/src/project.json +++ b/src/System.Diagnostics.Process/src/project.json @@ -1,41 +1,34 @@ { "frameworks": { - "netstandard1.4": { + "netstandard1.7": { "dependencies": { - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.InteropServices": "4.0.20", - "System.Runtime.Handles": "4.0.0", - "System.IO": "4.0.10", - "System.IO.FileSystem": "4.0.0", - "System.Text.Encoding": "4.0.10", - "System.Text.Encoding.Extensions": "4.0.10", - "System.Threading": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Threading.Thread": "4.0.0", - "System.Threading.ThreadPool": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", - "System.Globalization": "4.0.10", - "System.Diagnostics.Contracts": "4.0.0", - "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.IO.FileSystem.Primitives": "4.0.0", - "System.Collections": "4.0.10", - "Microsoft.Win32.Primitives": "4.0.0", - "Microsoft.Win32.Registry": "4.0.0" - }, - "imports": [ - "dotnet5.5" - ] - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" + "System.Runtime": "4.3.0-beta-24601-02", + "System.Runtime.Extensions": "4.3.0-beta-24601-02", + "System.Runtime.InteropServices":"4.3.0-beta-24601-02", + "System.Runtime.Handles": "4.3.0-beta-24601-02", + "System.IO": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", + "System.IO.FileSystem": "4.3.0-beta-24601-02", + "System.Text.Encoding": "4.3.0-beta-24601-02", + "System.Text.Encoding.Extensions": "4.3.0-beta-24601-02", + "System.Threading": "4.3.0-beta-24601-02", + "System.Threading.Tasks": "4.3.0-beta-24601-02", + "System.Threading.Thread": "4.3.0-beta-24601-02", + "System.Threading.ThreadPool": "4.3.0-beta-24601-02", + "System.Resources.ResourceManager": "4.3.0-beta-24601-02", + "System.Globalization": "4.3.0-beta-24601-02", + "System.Diagnostics.Contracts":"4.3.0-beta-24601-02", + "System.Diagnostics.Tools":"4.3.0-beta-24601-02", + "System.Diagnostics.Debug": "4.3.0-beta-24601-02", + "System.IO.FileSystem.Primitives": "4.3.0-beta-24601-02", + "System.Collections": "4.3.0-beta-24601-02", + "Microsoft.Win32.Primitives": "4.3.0-beta-24601-02", + "Microsoft.Win32.Registry":"4.3.0-beta-24601-02", } }, - "net461": { + "net463": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" + "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" } } } diff --git a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.cs b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.cs index 0413384cf4..20a5b5bebe 100644 --- a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.cs +++ b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.cs @@ -22,7 +22,7 @@ namespace System.IO public string Name { get { return default(string); } } } public delegate void FileSystemEventHandler(object sender, System.IO.FileSystemEventArgs e); - public partial class FileSystemWatcher + public partial class FileSystemWatcher : System.ComponentModel.Component { public FileSystemWatcher() { } public FileSystemWatcher(string path) { } diff --git a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj index 8392a54146..b9299d4ba2 100644 --- a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj +++ b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj @@ -7,7 +7,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="System.IO.FileSystem.Watcher.cs" /> - <Compile Include="System.IO.FileSystem.Watcher.manual.cs" /> </ItemGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.manual.cs b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.manual.cs deleted file mode 100644 index 6e633952b5..0000000000 --- a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.manual.cs +++ /dev/null @@ -1,16 +0,0 @@ -// 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. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the http://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - - -namespace System.IO -{ - public partial class FileSystemWatcher : IDisposable - { - protected virtual void Dispose(bool disposing) { } - public void Dispose() { } - } -} diff --git a/src/System.IO.FileSystem.Watcher/ref/project.json b/src/System.IO.FileSystem.Watcher/ref/project.json index f237c815e3..03e0d64ee2 100644 --- a/src/System.IO.FileSystem.Watcher/ref/project.json +++ b/src/System.IO.FileSystem.Watcher/ref/project.json @@ -1,6 +1,7 @@ { "dependencies": { - "System.Runtime": "4.3.0-beta-24601-02" + "System.Runtime": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02" }, "frameworks": { "netstandard1.7": { diff --git a/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs b/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs index 39e01cdc6a..2517040b32 100644 --- a/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs +++ b/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs @@ -2,6 +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.ComponentModel; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Threading; @@ -14,7 +15,7 @@ namespace System.IO /// raises events when a directory or file within a directory changes. /// </devdoc> - public partial class FileSystemWatcher : IDisposable + public partial class FileSystemWatcher : Component { /// <devdoc> /// Private instance variables @@ -348,20 +349,9 @@ namespace System.IO } } - - - /// <devdoc> - /// Disposes of the <see cref='System.IO.FileSystemWatcher'/>. - /// </devdoc> - public void Dispose() - { - this.Dispose(true); - GC.SuppressFinalize(this); - } - /// <devdoc> /// </devdoc> - protected virtual void Dispose(bool disposing) + protected override void Dispose(bool disposing) { try { diff --git a/src/System.IO.FileSystem.Watcher/src/project.json b/src/System.IO.FileSystem.Watcher/src/project.json index 184023472e..c277072227 100644 --- a/src/System.IO.FileSystem.Watcher/src/project.json +++ b/src/System.IO.FileSystem.Watcher/src/project.json @@ -5,6 +5,7 @@ "Microsoft.NETCore.Platforms": "1.0.1", "Microsoft.Win32.Primitives": "4.3.0-beta-24601-02", "System.Collections": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", "System.Diagnostics.Debug": "4.3.0-beta-24601-02", "System.Diagnostics.Tools": "4.3.0-beta-24601-02", "System.IO": "4.3.0-beta-24601-02", diff --git a/src/System.IO.FileSystem.Watcher/tests/project.json b/src/System.IO.FileSystem.Watcher/tests/project.json index 6b6347bb12..97ff279f16 100644 --- a/src/System.IO.FileSystem.Watcher/tests/project.json +++ b/src/System.IO.FileSystem.Watcher/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.NETCore.Platforms": "1.0.2-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", "System.Diagnostics.Process": "4.3.0-beta-24601-02", "System.IO": "4.3.0-beta-24601-02", "System.IO.FileSystem": "4.3.0-beta-24601-02", diff --git a/src/System.Net.Ping/pkg/System.Net.Ping.pkgproj b/src/System.Net.Ping/pkg/System.Net.Ping.pkgproj index 4ea50cd16f..43ae262208 100644 --- a/src/System.Net.Ping/pkg/System.Net.Ping.pkgproj +++ b/src/System.Net.Ping/pkg/System.Net.Ping.pkgproj @@ -4,7 +4,7 @@ <ItemGroup> <ProjectReference Include="..\ref\System.Net.Ping.csproj"> - <SupportedFramework>net46;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Net.Ping.builds" /> </ItemGroup> diff --git a/src/System.Net.Ping/ref/System.Net.Ping.Manual.cs b/src/System.Net.Ping/ref/System.Net.Ping.Manual.cs deleted file mode 100644 index b5172b2994..0000000000 --- a/src/System.Net.Ping/ref/System.Net.Ping.Manual.cs +++ /dev/null @@ -1,15 +0,0 @@ -// 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. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the http://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - -namespace System.Net.NetworkInformation -{ - public partial class Ping : IDisposable - { - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - } -} diff --git a/src/System.Net.Ping/ref/System.Net.Ping.cs b/src/System.Net.Ping/ref/System.Net.Ping.cs index 84820fe164..4ebfb6426f 100644 --- a/src/System.Net.Ping/ref/System.Net.Ping.cs +++ b/src/System.Net.Ping/ref/System.Net.Ping.cs @@ -35,7 +35,7 @@ namespace System.Net.NetworkInformation Unknown = -1, UnrecognizedNextHeader = 11043, } - public partial class Ping + public partial class Ping : System.ComponentModel.Component { public Ping() { } public event System.Net.NetworkInformation.PingCompletedEventHandler PingCompleted { add { } remove { } } diff --git a/src/System.Net.Ping/ref/System.Net.Ping.csproj b/src/System.Net.Ping/ref/System.Net.Ping.csproj index a56222b454..de37f06a92 100644 --- a/src/System.Net.Ping/ref/System.Net.Ping.csproj +++ b/src/System.Net.Ping/ref/System.Net.Ping.csproj @@ -3,11 +3,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <OutputType>Library</OutputType> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Ping.cs" /> - <Compile Include="System.Net.Ping.Manual.cs" /> </ItemGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.Net.Ping/ref/project.json b/src/System.Net.Ping/ref/project.json index 1f467b8cf2..f61d53c567 100644 --- a/src/System.Net.Ping/ref/project.json +++ b/src/System.Net.Ping/ref/project.json @@ -1,15 +1,12 @@ { "dependencies": { - "System.ComponentModel.EventBasedAsync": "4.0.10", - "System.Net.Primitives": "4.0.10", - "System.Runtime": "4.0.0", - "System.Threading.Tasks": "4.0.0" + "System.ComponentModel.EventBasedAsync": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", + "System.Net.Primitives": "4.3.0-beta-24601-02", + "System.Runtime": "4.3.0-beta-24601-02", + "System.Threading.Tasks": "4.3.0-beta-24601-02" }, "frameworks": { - "netstandard1.3": { - "imports": [ - "dotnet5.4" - ] - } + "netstandard1.7": { } } } diff --git a/src/System.Net.Ping/src/System.Net.Ping.builds b/src/System.Net.Ping/src/System.Net.Ping.builds index 7a31249b88..692bd1619a 100644 --- a/src/System.Net.Ping/src/System.Net.Ping.builds +++ b/src/System.Net.Ping/src/System.Net.Ping.builds @@ -9,7 +9,7 @@ <OSGroup>Windows_NT</OSGroup> </Project> <Project Include="System.Net.Ping.csproj"> - <TargetGroup>net46</TargetGroup> + <TargetGroup>net463</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Net.Ping/src/System.Net.Ping.csproj b/src/System.Net.Ping/src/System.Net.Ping.csproj index ab2bb3114c..b44a792fdd 100644 --- a/src/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/System.Net.Ping/src/System.Net.Ping.csproj @@ -9,9 +9,9 @@ <ProjectGuid>{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> - <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NugetTargetMoniker> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> + <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> + <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" /> @@ -20,7 +20,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="System\Net\NetworkInformation\IPStatus.cs" /> <Compile Include="System\Net\NetworkInformation\Ping.cs" /> <Compile Include="System\Net\NetworkInformation\PingCompletedEventArgs.cs" /> @@ -29,7 +29,7 @@ <Compile Include="System\Net\NetworkInformation\PingReply.cs" /> </ItemGroup> <!-- System.Net Common --> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="$(CommonPath)\System\Net\ByteOrder.cs"> <Link>Common\System\Net\ByteOrder.cs</Link> </Compile> @@ -44,7 +44,7 @@ </Compile> </ItemGroup> <!-- Logging --> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="$(CommonPath)\System\Net\Shims\TraceSource.cs"> <Link>Common\System\Net\Shims\TraceSource.cs</Link> </Compile> @@ -59,7 +59,7 @@ </Compile> </ItemGroup> <!-- System.Net.Internals --> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> <Compile Include="$(CommonPath)\System\Net\Internals\IPAddressExtensions.cs"> <Link>Common\System\Net\Internals\IPAddressExtensions.cs</Link> </Compile> @@ -101,7 +101,7 @@ <Link>Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net46' "> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net463' "> <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" /> <!-- System.Net Common --> <Compile Include="$(CommonPath)\System\Net\SocketAddressPal.Windows.cs"> @@ -110,10 +110,6 @@ <Compile Include="$(CommonPath)\System\Net\SocketProtocolSupportPal.Windows.cs"> <Link>Common\System\Net\SocketProtocolSupportPal.Windows.cs</Link> </Compile> - <!-- Microsoft.Win32.SafeHandles Common --> - <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs"> - <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link> - </Compile> <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs"> <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link> </Compile> @@ -147,7 +143,7 @@ <Link>Common\System\Net\Sockets\SocketType.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> <TargetingPackReference Include="System" /> </ItemGroup> diff --git a/src/System.Net.Ping/src/System/Net/NetworkInformation/Ping.cs b/src/System.Net.Ping/src/System/Net/NetworkInformation/Ping.cs index 07ba5bfabd..f412fa961c 100644 --- a/src/System.Net.Ping/src/System/Net/NetworkInformation/Ping.cs +++ b/src/System.Net.Ping/src/System/Net/NetworkInformation/Ping.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace System.Net.NetworkInformation { - public partial class Ping : IDisposable + public partial class Ping : Component { private const int DefaultSendBufferSize = 32; // Same as ping.exe on Windows. private const int DefaultTimeout = 5000; // 5 seconds: same as ping.exe on Windows. @@ -26,7 +26,7 @@ namespace System.Net.NetworkInformation // Thread safety: private const int Free = 0; private const int InProgress = 1; - private const int Disposed = 2; + private new const int Disposed = 2; private int _status = Free; public Ping() @@ -110,13 +110,7 @@ namespace System.Net.NetworkInformation InternalDisposeCore(); } - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - protected virtual void Dispose(bool disposing) + protected override void Dispose(bool disposing) { if (disposing) { diff --git a/src/System.Net.Ping/src/project.json b/src/System.Net.Ping/src/project.json index 02391f0cbb..08f17f8d04 100644 --- a/src/System.Net.Ping/src/project.json +++ b/src/System.Net.Ping/src/project.json @@ -1,34 +1,33 @@ { "frameworks": { - "netstandard1.3": { + "netstandard1.7": { "dependencies": { "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.Win32.Primitives": "4.0.0", - "System.Collections": "4.0.10", - "System.ComponentModel.EventBasedAsync": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Process": "4.1.0", - "System.Diagnostics.Tracing": "4.0.20", - "System.IO.FileSystem": "4.0.0", - "System.Net.NameResolution": "4.0.0", - "System.Net.Primitives": "4.0.10", - "System.Net.Sockets": "4.1.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.Handles": "4.0.0", - "System.Runtime.InteropServices": "4.0.20", - "System.Threading": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Threading.ThreadPool": "4.0.10" - }, - "imports": [ - "dotnet5.4" - ] + "Microsoft.Win32.Primitives": "4.3.0-beta-24601-02", + "System.Collections": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", + "System.ComponentModel.EventBasedAsync": "4.3.0-beta-24601-02", + "System.Diagnostics.Debug": "4.3.0-beta-24601-02", + "System.Diagnostics.Process": "4.3.0-beta-24601-02", + "System.Diagnostics.Tracing": "4.3.0-beta-24601-02", + "System.Globalization": "4.3.0-beta-24601-02", + "System.IO.FileSystem": "4.3.0-beta-24601-02", + "System.Net.NameResolution": "4.3.0-beta-24601-02", + "System.Net.Primitives": "4.3.0-beta-24601-02", + "System.Net.Sockets": "4.3.0-beta-24601-02", + "System.Resources.ResourceManager": "4.3.0-beta-24601-02", + "System.Runtime": "4.3.0-beta-24601-02", + "System.Runtime.Extensions": "4.3.0-beta-24601-02", + "System.Runtime.Handles": "4.3.0-beta-24601-02", + "System.Runtime.InteropServices": "4.3.0-beta-24601-02", + "System.Threading": "4.3.0-beta-24601-02", + "System.Threading.Tasks": "4.3.0-beta-24601-02", + "System.Threading.ThreadPool": "4.3.0-beta-24601-02", + } }, - "net46": { + "net463": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" + "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" } } } diff --git a/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj index 4e65df6011..ba8b29309a 100644 --- a/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj +++ b/src/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj @@ -9,15 +9,20 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{43CE20B7-389B-41BB-8390-447521DF3BD4}</ProjectGuid> <OutputType>Library</OutputType> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> + <NugetTargetMoniker Condition="'$(TargetGroup)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <!-- Help VS understand available configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> + + <!-- Test APIs introduced after 1.0 --> + <ItemGroup Condition="'$(TargetGroup)'==''"> + <Compile Include="PingTest.cs" /> + </ItemGroup> + <ItemGroup> <Compile Include="PingExceptionTest.cs" /> <Compile Include="PingOptionsTest.cs" /> - <Compile Include="PingTest.cs" /> <Compile Include="TestSettings.cs" /> <Compile Include="UnixPingUtilityTests.cs" /> <!-- System.Net Common --> @@ -34,7 +39,7 @@ <Link>Common\tests\System\PlatformDetection.cs</Link> </Compile> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)'==''"> <ProjectReference Include="..\..\pkg\System.Net.Ping.pkgproj"> <Project>{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}</Project> <Name>System.Net.Ping</Name> diff --git a/src/System.Net.Ping/tests/FunctionalTests/project.json b/src/System.Net.Ping/tests/FunctionalTests/project.json index e5959bb5da..4cb560ed4f 100644 --- a/src/System.Net.Ping/tests/FunctionalTests/project.json +++ b/src/System.Net.Ping/tests/FunctionalTests/project.json @@ -2,6 +2,7 @@ "dependencies": { "Microsoft.NETCore.Platforms": "1.0.2-beta-24601-02", "System.ComponentModel.EventBasedAsync": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", "System.Diagnostics.Process": "4.3.0-beta-24601-02", "System.IO.FileSystem": "4.3.0-beta-24601-02", "System.Linq.Expressions": "4.3.0-beta-24601-02", @@ -18,10 +19,16 @@ "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02" }, "frameworks": { - "netstandard1.3": {} + "netstandard1.3": { + "dependencies": { + "System.Net.Ping": "4.3.0-beta-24601-02" + } + }, + "netstandard1.7": {} }, "supports": { "coreFx.Test.netcoreapp1.0": {}, + "coreFx.Test.netcoreapp1.1": {}, "coreFx.Test.net46": {}, "coreFx.Test.net461": {}, "coreFx.Test.net462": {}, diff --git a/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds b/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds index f3a8c89a51..8682a7f575 100644 --- a/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds +++ b/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds @@ -6,8 +6,13 @@ <OSGroup>Unix</OSGroup> </Project> <Project Include="FunctionalTests\System.Net.Ping.Functional.Tests.csproj"> + <TestTFMs>netcoreapp1.1;net463</TestTFMs> + <OSGroup>Windows_NT</OSGroup> + </Project> + <Project Include="FunctionalTests\System.Net.Ping.Functional.Tests.csproj"> <TestTFMs>netcoreapp1.0;net46</TestTFMs> <OSGroup>Windows_NT</OSGroup> + <TargetGroup>netstandard1.3</TargetGroup> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Net.WebClient/ref/System.Net.WebClient.cs b/src/System.Net.WebClient/ref/System.Net.WebClient.cs index e24c2a94b5..6152f4c752 100644 --- a/src/System.Net.WebClient/ref/System.Net.WebClient.cs +++ b/src/System.Net.WebClient/ref/System.Net.WebClient.cs @@ -71,7 +71,7 @@ namespace System.Net public byte[] Result { get { throw null; } } } public delegate void UploadValuesCompletedEventHandler(object sender, System.Net.UploadValuesCompletedEventArgs e); - public class WebClient + public class WebClient : System.ComponentModel.Component { public WebClient() { } [System.Obsolete("This API supports the .NET Framework infrastructure and is not intended to be used directly from your code.", true)] diff --git a/src/System.Net.WebClient/ref/project.json b/src/System.Net.WebClient/ref/project.json index 1383d81565..c7da228f51 100644 --- a/src/System.Net.WebClient/ref/project.json +++ b/src/System.Net.WebClient/ref/project.json @@ -2,6 +2,7 @@ "dependencies": { "System.Collections.Specialized": "4.3.0-beta-24601-02", "System.ComponentModel": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", "System.ComponentModel.EventBasedAsync": "4.3.0-beta-24601-02", "System.IO": "4.3.0-beta-24601-02", "System.Net.Primitives": "4.3.0-beta-24601-02", diff --git a/src/System.Net.WebClient/src/System/Net/WebClient.cs b/src/System.Net.WebClient/src/System/Net/WebClient.cs index 99755630e4..b678f2b9c3 100644 --- a/src/System.Net.WebClient/src/System/Net/WebClient.cs +++ b/src/System.Net.WebClient/src/System/Net/WebClient.cs @@ -16,7 +16,7 @@ using System.Threading.Tasks; namespace System.Net { - public class WebClient // TODO #11271: Make WebClient inherit from Component once it's available + public class WebClient : Component { private const int DefaultCopyBufferLength = 8192; private const int DefaultDownloadBufferLength = 65536; diff --git a/src/System.Net.WebClient/src/project.json b/src/System.Net.WebClient/src/project.json index fce8a7b4bd..d042f3cbff 100644 --- a/src/System.Net.WebClient/src/project.json +++ b/src/System.Net.WebClient/src/project.json @@ -6,6 +6,7 @@ "System.Collections": "4.3.0-beta-24601-02", "System.Collections.Specialized": "4.3.0-beta-24601-02", "System.ComponentModel": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", "System.ComponentModel.EventBasedAsync": "4.3.0-beta-24601-02", "System.Diagnostics.Debug": "4.3.0-beta-24601-02", "System.Diagnostics.Tools": "4.3.0-beta-24601-02", diff --git a/src/System.Net.WebClient/tests/project.json b/src/System.Net.WebClient/tests/project.json index 6cfb22e297..13c6e68419 100644 --- a/src/System.Net.WebClient/tests/project.json +++ b/src/System.Net.WebClient/tests/project.json @@ -5,6 +5,7 @@ "System.Collections.NonGeneric": "4.3.0-beta-24601-02", "System.Collections.Specialized": "4.3.0-beta-24601-02", "System.ComponentModel": "4.3.0-beta-24601-02", + "System.ComponentModel.Primitives": "4.3.0-beta-24601-02", "System.ComponentModel.EventBasedAsync": "4.3.0-beta-24601-02", "System.Diagnostics.Debug": "4.3.0-beta-24601-02", "System.Globalization": "4.3.0-beta-24601-02", |