diff options
43 files changed, 198 insertions, 156 deletions
diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index bada0938e5..a7420f4c7a 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -187,7 +187,9 @@ "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.4.0", "4.0.2.0": "4.3.0", - "4.0.3.0": "4.4.0" + "4.0.3.0": "4.4.0", + "4.0.1.0": "4.4.0", + "4.1.0.0": "4.4.0" } }, "runtime.any.System.Runtime": { @@ -351,7 +353,8 @@ ], "BaselineVersion": "4.4.0", "AssemblyVersionInPackageVersion": { - "4.0.0.0": "4.4.0" + "4.0.0.0": "4.4.0", + "4.1.0.0": "4.4.0" } }, "runtime.aot.System.Runtime": { diff --git a/src/Common/src/System/SystemException.cs b/src/Common/src/System/SystemException.cs new file mode 100644 index 0000000000..c06cc94ea1 --- /dev/null +++ b/src/Common/src/System/SystemException.cs @@ -0,0 +1,30 @@ +// 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; +using System.Runtime.Serialization; + +// TODO: remove this stub once System.SystemException is added to UWP +namespace System { + + [Serializable] + [System.Runtime.InteropServices.ComVisible(true)] + public class SystemException : Exception + { + public SystemException() + : base("System error.") { + } + + public SystemException(String message) + : base(message) { + } + + public SystemException(String message, Exception innerException) + : base(message, innerException) { + } + + protected SystemException(SerializationInfo info, StreamingContext context) : base(info, context) { + } + } +}
\ No newline at end of file diff --git a/src/System.Globalization/ref/4.0.10/System.Globalization.depproj b/src/System.Globalization/ref/4.0.10/System.Globalization.depproj deleted file mode 100644 index 547b7a6af4..0000000000 --- a/src/System.Globalization/ref/4.0.10/System.Globalization.depproj +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <AssemblyVersion>4.0.10.0</AssemblyVersion> - <OutputType>Library</OutputType> - <PackageTargetFramework>netstandard1.3</PackageTargetFramework> - <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.Globalization/ref/4.0.10/project.json b/src/System.Globalization/ref/4.0.10/project.json deleted file mode 100644 index 9d06e6724a..0000000000 --- a/src/System.Globalization/ref/4.0.10/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Globalization": "4.0.10" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ - "dotnet5.1" - ] - } - } -}
\ No newline at end of file diff --git a/src/System.Globalization/ref/System.Globalization.csproj b/src/System.Globalization/ref/System.Globalization.csproj index 261bf668d8..5cc2afcb67 100644 --- a/src/System.Globalization/ref/System.Globalization.csproj +++ b/src/System.Globalization/ref/System.Globalization.csproj @@ -2,7 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.1.0.0</AssemblyVersion> <OutputType>Library</OutputType> <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> diff --git a/src/System.Globalization/src/ApiCompatBaseline.uap101aot.txt b/src/System.Globalization/src/ApiCompatBaseline.uap101aot.txt index c74d986184..bc33a60003 100644 --- a/src/System.Globalization/src/ApiCompatBaseline.uap101aot.txt +++ b/src/System.Globalization/src/ApiCompatBaseline.uap101aot.txt @@ -66,4 +66,5 @@ MembersMustExist : Member 'System.Globalization.TextInfo.LCID.get()' does not ex MembersMustExist : Member 'System.Globalization.TextInfo.MacCodePage.get()' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.Globalization.TextInfo.OEMCodePage.get()' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.Globalization.TextInfo.ReadOnly(System.Globalization.TextInfo)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Globalization.TextInfo.ToTitleCase(System.String)' does not exist in the implementation but it does exist in the contract.
\ No newline at end of file +MembersMustExist : Member 'System.Globalization.TextInfo.ToTitleCase(System.String)' does not exist in the implementation but it does exist in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.Globalization.CultureNotFoundException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract.
\ No newline at end of file diff --git a/src/System.Globalization/src/System.Globalization.csproj b/src/System.Globalization/src/System.Globalization.csproj index 9a4691d642..35a07fbbcd 100644 --- a/src/System.Globalization/src/System.Globalization.csproj +++ b/src/System.Globalization/src/System.Globalization.csproj @@ -3,7 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Globalization</AssemblyName> - <ContractProject Condition="'$(AssemblyVersion)'!='4.1.0.0'">../ref/4.0.10/System.Globalization.depproj</ContractProject> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> diff --git a/src/System.Globalization/src/project.json b/src/System.Globalization/src/project.json index 39a7a5f408..e71371a75a 100644 --- a/src/System.Globalization/src/project.json +++ b/src/System.Globalization/src/project.json @@ -15,7 +15,7 @@ }, "net463": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" + "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" } } } diff --git a/src/System.IO/ref/System.IO.cs b/src/System.IO/ref/System.IO.cs index c34350888f..de56137bae 100644 --- a/src/System.IO/ref/System.IO.cs +++ b/src/System.IO/ref/System.IO.cs @@ -163,7 +163,7 @@ namespace System.IO public EndOfStreamException(string message) { } public EndOfStreamException(string message, System.Exception innerException) { } } - public sealed partial class InvalidDataException : System.Exception + public sealed partial class InvalidDataException : System.SystemException { public InvalidDataException() { } public InvalidDataException(string message) { } diff --git a/src/System.IO/src/ApiCompatBaseline.uap101aot.txt b/src/System.IO/src/ApiCompatBaseline.uap101aot.txt index 2796c5fd4d..f3586acfe8 100644 --- a/src/System.IO/src/ApiCompatBaseline.uap101aot.txt +++ b/src/System.IO/src/ApiCompatBaseline.uap101aot.txt @@ -6,4 +6,7 @@ MembersMustExist : Member 'System.IO.Stream.CreateWaitHandle()' does not exist i MembersMustExist : Member 'System.IO.Stream.ObjectInvariant()' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.IO.Stream.Synchronized(System.IO.Stream)' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.IO.TextReader.Synchronized(System.IO.TextReader)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.IO.TextWriter.Synchronized(System.IO.TextWriter)' does not exist in the implementation but it does exist in the contract.
\ No newline at end of file +MembersMustExist : Member 'System.IO.TextWriter.Synchronized(System.IO.TextWriter)' does not exist in the implementation but it does exist in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IO.EndOfStreamException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IO.FileNotFoundException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IO.IOException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. diff --git a/src/System.IO/src/System.IO.csproj b/src/System.IO/src/System.IO.csproj index 5e6d41abe9..79956fbb75 100644 --- a/src/System.IO/src/System.IO.csproj +++ b/src/System.IO/src/System.IO.csproj @@ -68,6 +68,7 @@ <!-- Common --> <ItemGroup Condition="'$(TargetGroup)' == 'uap101aot'"> + <Compile Include="$(CommonPath)\System\SystemException.cs" /> <Compile Include="$(CommonPath)\System\HResults.cs"> <Link>Common\System\HResults.cs</Link> </Compile> diff --git a/src/System.IO/src/System/IO/InvalidDataException.cs b/src/System.IO/src/System/IO/InvalidDataException.cs index 8466af3607..0d2f4e5a7e 100644 --- a/src/System.IO/src/System/IO/InvalidDataException.cs +++ b/src/System.IO/src/System/IO/InvalidDataException.cs @@ -4,7 +4,7 @@ namespace System.IO { - public sealed class InvalidDataException : Exception + public sealed class InvalidDataException : SystemException { public InvalidDataException() : base(SR.GenericInvalidData) diff --git a/src/System.Net.Security/ref/System.Net.Security.cs b/src/System.Net.Security/ref/System.Net.Security.cs index aef648358f..5998b854c0 100644 --- a/src/System.Net.Security/ref/System.Net.Security.cs +++ b/src/System.Net.Security/ref/System.Net.Security.cs @@ -142,7 +142,7 @@ namespace System.Net.Security } namespace System.Security.Authentication { - public partial class AuthenticationException : System.Exception + public partial class AuthenticationException : System.SystemException { public AuthenticationException() { } public AuthenticationException(string message) { } diff --git a/src/System.Net.Security/src/System/Security/Authentication/AuthenticationException.cs b/src/System.Net.Security/src/System/Security/Authentication/AuthenticationException.cs index 7df2b03c87..bbededf329 100644 --- a/src/System.Net.Security/src/System/Security/Authentication/AuthenticationException.cs +++ b/src/System.Net.Security/src/System/Security/Authentication/AuthenticationException.cs @@ -9,7 +9,7 @@ namespace System.Security.Authentication /// The authentication process can be retried with different parameters subject to /// remote party willingness of accepting that. /// </summary> - public class AuthenticationException : Exception + public class AuthenticationException : SystemException { public AuthenticationException() { } public AuthenticationException(string message) : base(message) { } diff --git a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SerializationException.cs b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SerializationException.cs index fea87b382b..0709cd6d4a 100644 --- a/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SerializationException.cs +++ b/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SerializationException.cs @@ -6,7 +6,7 @@ using System; namespace System.Runtime.Serialization { - public class SerializationException : Exception + public class SerializationException : SystemException { public SerializationException() { } diff --git a/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj index e900f95301..fae72be0de 100644 --- a/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj +++ b/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj @@ -4,7 +4,7 @@ <PropertyGroup> <OutputType>Library</OutputType> <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker> - <PackageTargetFramework>netstandard1.7;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.7;uap10.1</PackageTargetFramework> </PropertyGroup> <ItemGroup> <Compile Include="System.Resources.ResourceManager.cs" /> diff --git a/src/System.Resources.ResourceManager/src/System/Resources/MissingManifestResourceException.cs b/src/System.Resources.ResourceManager/src/System/Resources/MissingManifestResourceException.cs index 9dc8bf9b7d..f8c9936929 100644 --- a/src/System.Resources.ResourceManager/src/System/Resources/MissingManifestResourceException.cs +++ b/src/System.Resources.ResourceManager/src/System/Resources/MissingManifestResourceException.cs @@ -4,7 +4,7 @@ namespace System.Resources { - public class MissingManifestResourceException : Exception + public class MissingManifestResourceException : SystemException { public MissingManifestResourceException() : base(SR.Arg_MissingManifestResourceException) diff --git a/src/System.Resources.ResourceManager/src/project.json b/src/System.Resources.ResourceManager/src/project.json index 659946a6cf..242771f380 100644 --- a/src/System.Resources.ResourceManager/src/project.json +++ b/src/System.Resources.ResourceManager/src/project.json @@ -5,23 +5,22 @@ "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24617-03" } }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } - }, "uap10.1": { "dependencies": { "Microsoft.NETCore.Platforms": "1.0.1", "Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-24607-01", "Microsoft.TargetingPack.Private.WinRT": "1.0.1", - "System.Diagnostics.Debug": "4.0.0", - "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Tracing": "4.0.0", - "System.Globalization": "4.0.0", - "System.Reflection": "4.0.10", - "System.Runtime": "4.0.20", - "System.Threading": "4.0.10" + "System.Diagnostics.Debug": "4.4.0-beta-24617-03", + "System.Diagnostics.Tools": "4.4.0-beta-24617-03", + "System.Diagnostics.Tracing": "4.4.0-beta-24617-03", + "System.Reflection": "4.4.0-beta-24617-03", + "System.Runtime": "4.4.0-beta-24617-03", + "System.Threading": "4.4.0-beta-24617-03" + } + }, + "net463": { + "dependencies": { + "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" } } } diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs index 69f8f767b6..de58f6409d 100644 --- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs +++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs @@ -12,7 +12,7 @@ namespace System { - public sealed partial class DataMisalignedException : System.Exception + public sealed partial class DataMisalignedException : System.SystemException { public DataMisalignedException() { } public DataMisalignedException(string message) { } @@ -426,13 +426,13 @@ namespace System.Runtime.InteropServices public InterfaceTypeAttribute(System.Runtime.InteropServices.ComInterfaceType interfaceType) { } public System.Runtime.InteropServices.ComInterfaceType Value { get { throw null; } } } - public partial class InvalidComObjectException : System.Exception + public partial class InvalidComObjectException : System.SystemException { public InvalidComObjectException() { } public InvalidComObjectException(string message) { } public InvalidComObjectException(string message, System.Exception inner) { } } - public partial class InvalidOleVariantTypeException : System.Exception + public partial class InvalidOleVariantTypeException : System.SystemException { public InvalidOleVariantTypeException() { } public InvalidOleVariantTypeException(string message) { } @@ -761,7 +761,7 @@ namespace System.Runtime.InteropServices public MarshalAsAttribute(System.Runtime.InteropServices.UnmanagedType unmanagedType) { } public System.Runtime.InteropServices.UnmanagedType Value { get { throw null; } } } - public partial class MarshalDirectiveException : System.Exception + public partial class MarshalDirectiveException : System.SystemException { public MarshalDirectiveException() { } public MarshalDirectiveException(string message) { } @@ -777,13 +777,13 @@ namespace System.Runtime.InteropServices { public PreserveSigAttribute() { } } - public partial class SafeArrayRankMismatchException : System.Exception + public partial class SafeArrayRankMismatchException : System.SystemException { public SafeArrayRankMismatchException() { } public SafeArrayRankMismatchException(string message) { } public SafeArrayRankMismatchException(string message, System.Exception inner) { } } - public partial class SafeArrayTypeMismatchException : System.Exception + public partial class SafeArrayTypeMismatchException : System.SystemException { public SafeArrayTypeMismatchException() { } public SafeArrayTypeMismatchException(string message) { } diff --git a/src/System.Runtime.Serialization.Primitives/src/ApiCompatBaseline.uap101aot.txt b/src/System.Runtime.Serialization.Primitives/src/ApiCompatBaseline.uap101aot.txt new file mode 100644 index 0000000000..e45d9fd2e3 --- /dev/null +++ b/src/System.Runtime.Serialization.Primitives/src/ApiCompatBaseline.uap101aot.txt @@ -0,0 +1 @@ +CannotRemoveBaseTypeOrInterface : Type 'System.Runtime.Serialization.SerializationException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract.
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index 92799b1939..13872b8178 100644 --- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -56,6 +56,10 @@ <ItemGroup> <None Include="project.json" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == ''"> + <!-- TODO: remove this P2P reference once new packages are produced and updated --> + <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + </ItemGroup> <ItemGroup> <EmbeddedResource Include="Resources\$(AssemblyName).rd.xml" /> </ItemGroup> diff --git a/src/System.Runtime/ref/System.Runtime.cs b/src/System.Runtime/ref/System.Runtime.cs index 9222babfbc..8db02060e1 100644 --- a/src/System.Runtime/ref/System.Runtime.cs +++ b/src/System.Runtime/ref/System.Runtime.cs @@ -153,7 +153,7 @@ namespace System public void Handle(System.Func<System.Exception, bool> predicate) { } public override string ToString() { throw null; } } - public partial class ArgumentException : System.Exception, System.Runtime.Serialization.ISerializable + public partial class ArgumentException : System.SystemException, System.Runtime.Serialization.ISerializable { public ArgumentException() { } public ArgumentException(string message) { } @@ -185,7 +185,7 @@ namespace System public override string Message { get { throw null; } } public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } - public partial class ArithmeticException : System.Exception + public partial class ArithmeticException : System.SystemException { public ArithmeticException() { } public ArithmeticException(string message) { } @@ -338,7 +338,7 @@ namespace System void System.Collections.Generic.IList<T>.RemoveAt(int index) { } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } } - public partial class ArrayTypeMismatchException : System.Exception + public partial class ArrayTypeMismatchException : System.SystemException { public ArrayTypeMismatchException() { } public ArrayTypeMismatchException(string message) { } @@ -416,7 +416,7 @@ namespace System public bool Inherited { get { throw null; } set { } } public System.AttributeTargets ValidOn { get { throw null; } } } - public partial class BadImageFormatException : System.Exception + public partial class BadImageFormatException : System.SystemException { public BadImageFormatException() { } public BadImageFormatException(string message) { } @@ -1159,7 +1159,7 @@ namespace System { public FlagsAttribute() { } } - public partial class FormatException : System.Exception + public partial class FormatException : System.SystemException { public FormatException() { } public FormatException(string message) { } @@ -1311,13 +1311,13 @@ namespace System { string ToString(string format, System.IFormatProvider formatProvider); } - public sealed partial class IndexOutOfRangeException : System.Exception + public sealed partial class IndexOutOfRangeException : System.SystemException { public IndexOutOfRangeException() { } public IndexOutOfRangeException(string message) { } public IndexOutOfRangeException(string message, System.Exception innerException) { } } - public sealed partial class InsufficientExecutionStackException : System.Exception + public sealed partial class InsufficientExecutionStackException : System.SystemException { public InsufficientExecutionStackException() { } public InsufficientExecutionStackException(string message) { } @@ -1481,7 +1481,7 @@ namespace System public override string ToString() { throw null; } public string ToString(string format) { throw null; } } - public partial class InvalidCastException : System.Exception + public partial class InvalidCastException : System.SystemException { public InvalidCastException() { } public InvalidCastException(string message) { } @@ -1489,14 +1489,14 @@ namespace System public InvalidCastException(string message, int errorCode) { } protected InvalidCastException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } } - public partial class InvalidOperationException : System.Exception + public partial class InvalidOperationException : System.SystemException { public InvalidOperationException() { } public InvalidOperationException(string message) { } public InvalidOperationException(string message, System.Exception innerException) { } protected InvalidOperationException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } } - public sealed partial class InvalidProgramException : System.Exception + public sealed partial class InvalidProgramException : System.SystemException { public InvalidProgramException() { } public InvalidProgramException(string message) { } @@ -1552,7 +1552,7 @@ namespace System public Lazy(System.Func<T> valueFactory, TMetadata metadata, System.Threading.LazyThreadSafetyMode mode) { } public TMetadata Metadata { get { throw null; } } } - public partial class MemberAccessException : System.Exception + public partial class MemberAccessException : System.SystemException { public MemberAccessException() { } public MemberAccessException(string message) { } @@ -1648,14 +1648,14 @@ namespace System { } } - public partial class NotImplementedException : System.Exception + public partial class NotImplementedException : System.SystemException { public NotImplementedException() { } public NotImplementedException(string message) { } public NotImplementedException(string message, System.Exception inner) { } protected NotImplementedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } } - public partial class NotSupportedException : System.Exception + public partial class NotSupportedException : System.SystemException { public NotSupportedException() { } public NotSupportedException(string message) { } @@ -1682,7 +1682,7 @@ namespace System public static implicit operator System.Nullable<T>(T value) { throw null; } public override string ToString() { throw null; } } - public partial class NullReferenceException : System.Exception + public partial class NullReferenceException : System.SystemException { public NullReferenceException() { } public NullReferenceException(string message) { } @@ -1720,7 +1720,7 @@ namespace System public bool IsError { get { throw null; } } public string Message { get { throw null; } } } - public partial class OutOfMemoryException : System.Exception + public partial class OutOfMemoryException : System.SystemException { public OutOfMemoryException() { } public OutOfMemoryException(string message) { } @@ -1745,7 +1745,7 @@ namespace System protected PlatformNotSupportedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) { } } public delegate bool Predicate<in T>(T obj); - public partial class RankException : System.Exception + public partial class RankException : System.SystemException { public RankException() { } public RankException(string message) { } @@ -2082,7 +2082,7 @@ namespace System { public ThreadStaticAttribute() { } } - public partial class TimeoutException : System.Exception + public partial class TimeoutException : System.SystemException { public TimeoutException() { } public TimeoutException(string message) { } @@ -2588,13 +2588,13 @@ namespace System UInt32 = 10, UInt64 = 12, } - public sealed partial class TypeInitializationException : System.Exception + public sealed partial class TypeInitializationException : System.SystemException { public TypeInitializationException(string fullTypeName, System.Exception innerException) { } public string TypeName { get { throw null; } } public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } } - public partial class TypeLoadException : System.Exception, System.Runtime.Serialization.ISerializable + public partial class TypeLoadException : System.SystemException, System.Runtime.Serialization.ISerializable { public TypeLoadException() { } public TypeLoadException(string message) { } @@ -2778,7 +2778,7 @@ namespace System public uint ToUInt32() { throw null; } public ulong ToUInt64() { throw null; } } - public partial class UnauthorizedAccessException : System.Exception + public partial class UnauthorizedAccessException : System.SystemException { public UnauthorizedAccessException() { } public UnauthorizedAccessException(string message) { } @@ -4420,7 +4420,7 @@ namespace System.IO Inheritable = 1, None = 0, } - public partial class IOException : System.Exception + public partial class IOException : System.SystemException { public IOException() { } public IOException(string message) { } @@ -6022,7 +6022,7 @@ namespace System.Runtime.Serialization public Type ObjectType { get { throw null; } } public object Value { get { throw null; } } } - public partial class SerializationException : System.Exception + public partial class SerializationException : System.SystemException { public SerializationException() { } public SerializationException(string message) { } diff --git a/src/System.Runtime/src/ApiCompatBaseline.uap101aot.txt b/src/System.Runtime/src/ApiCompatBaseline.uap101aot.txt index 48a0561df3..f328bef991 100644 --- a/src/System.Runtime/src/ApiCompatBaseline.uap101aot.txt +++ b/src/System.Runtime/src/ApiCompatBaseline.uap101aot.txt @@ -250,7 +250,6 @@ MembersMustExist : Member 'System.String.ToString(System.IFormatProvider)' does MembersMustExist : Member 'System.String.ToUpper(System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.StringComparison System.StringComparison.InvariantCulture' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.StringComparison System.StringComparison.InvariantCultureIgnoreCase' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.SystemException' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.TimeoutException..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.TimeSpan.CompareTo(System.Object)' does not exist in the implementation but it does exist in the contract. CannotRemoveBaseTypeOrInterface : Type 'System.TimeZoneInfo' does not implement interface 'System.Runtime.Serialization.ISerializable' in the implementation but it does in the contract. @@ -532,4 +531,48 @@ CannotRemoveBaseTypeOrInterface : Type 'System.Threading.Tasks.Task' does not im MembersMustExist : Member 'System.Threading.Tasks.Task.Dispose()' does not exist in the implementation but it does exist in the contract. MembersMustExist : Member 'System.Threading.Tasks.Task.Dispose(System.Boolean)' does not exist in the implementation but it does exist in the contract. CannotRemoveBaseTypeOrInterface : Type 'System.Threading.Tasks.Task<TResult>' does not implement interface 'System.IDisposable' in the implementation but it does in the contract. -Total Issues: 533 +CannotRemoveBaseTypeOrInterface : Type 'System.ArgumentException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.ArgumentNullException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.ArgumentOutOfRangeException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.ArithmeticException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.ArrayTypeMismatchException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.BadImageFormatException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.DivideByZeroException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.FieldAccessException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.FormatException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IndexOutOfRangeException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.InsufficientExecutionStackException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.InvalidCastException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.InvalidOperationException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.InvalidProgramException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.MemberAccessException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.MethodAccessException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.MissingFieldException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.MissingMemberException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.MissingMethodException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.NotImplementedException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.NotSupportedException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.NullReferenceException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.ObjectDisposedException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.OutOfMemoryException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.OverflowException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.PlatformNotSupportedException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.RankException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.TimeoutException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.TypeAccessException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.TypeInitializationException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.TypeLoadException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.UnauthorizedAccessException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.UriFormatException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.Collections.Generic.KeyNotFoundException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.Globalization.CultureNotFoundException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IO.DirectoryNotFoundException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IO.FileLoadException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IO.FileNotFoundException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IO.IOException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.IO.PathTooLongException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.Reflection.CustomAttributeFormatException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.Runtime.Serialization.SerializationException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.Text.DecoderFallbackException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.Text.EncoderFallbackException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +Total Issues: 578 diff --git a/src/System.Runtime/src/System.Runtime.csproj b/src/System.Runtime/src/System.Runtime.csproj index 7514ffcd0a..4043ec5abc 100644 --- a/src/System.Runtime/src/System.Runtime.csproj +++ b/src/System.Runtime/src/System.Runtime.csproj @@ -43,6 +43,9 @@ <ItemGroup Condition="'$(TargetGroup)'!='netcore50aot' And '$(TargetGroup)'!='uap101aot' And '$(TargetGroup)'!='net462' AND '$(TargetGroup)'!='net463'"> <Compile Include="System\ComponentModel\DefaultValueAttribute.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)'=='uap101aot' Or '$(TargetGroup)'=='uap101'"> + <Compile Include="$(CommonPath)\System\SystemException.cs" /> + </ItemGroup> <ItemGroup > <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" Condition="'$(TargetGroup)' != 'net462' And '$(TargetGroup)' != 'net463' And '$(TargetGroup)' != 'uap101aot'"> <OSGroup>Windows_NT</OSGroup> diff --git a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs index 3d16b625a2..86556f70ae 100644 --- a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs +++ b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.cs @@ -24,7 +24,7 @@ namespace System.Security.Cryptography CTS = 5, ECB = 2, } - public partial class CryptographicException : System.Exception + public partial class CryptographicException : System.SystemException { public CryptographicException() { } public CryptographicException(int hr) { } diff --git a/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptographicException.cs b/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptographicException.cs index 9de4dff1e9..62613c98b7 100644 --- a/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptographicException.cs +++ b/src/System.Security.Cryptography.Primitives/src/System/Security/Cryptography/CryptographicException.cs @@ -7,7 +7,7 @@ using System.Runtime.Serialization; namespace System.Security.Cryptography { - public class CryptographicException : Exception + public class CryptographicException : SystemException { public CryptographicException() : base(SR.Arg_CryptographyException) diff --git a/src/System.Security.Cryptography.Primitives/src/project.json b/src/System.Security.Cryptography.Primitives/src/project.json index 46cbd4616c..b6c1ee3c96 100644 --- a/src/System.Security.Cryptography.Primitives/src/project.json +++ b/src/System.Security.Cryptography.Primitives/src/project.json @@ -10,14 +10,11 @@ "System.Runtime": "4.4.0-beta-24617-03", "System.Threading": "4.4.0-beta-24617-03", "System.Threading.Tasks": "4.4.0-beta-24617-03" - }, - "imports": [ - "dotnet5.8" - ] + } }, "net463": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" + "Microsoft.TargetingPack.NETFramework.v4.6.2": "1.0.1" } } } diff --git a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj index c25a812c12..7a6067538e 100644 --- a/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj +++ b/src/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj @@ -4,7 +4,7 @@ <ItemGroup> <ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj"> - <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework> + <SupportedFramework>net463;netcoreapp1.1</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Security.Principal.Windows.builds" /> </ItemGroup> diff --git a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.cs b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.cs index a0673c98c9..97f1e3d67a 100644 --- a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.cs +++ b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.cs @@ -20,7 +20,7 @@ namespace Microsoft.Win32.SafeHandles } namespace System.Security.Principal { - public sealed partial class IdentityNotMappedException : System.Exception + public sealed partial class IdentityNotMappedException : System.SystemException { public IdentityNotMappedException() { } public IdentityNotMappedException(string message) { } diff --git a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj index 5217078ff8..cdf4360289 100644 --- a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj +++ b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj @@ -3,7 +3,7 @@ <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.Security.Principal.Windows.cs" /> diff --git a/src/System.Security.Principal.Windows/ref/project.json b/src/System.Security.Principal.Windows/ref/project.json index 4531d2603b..2bfd458b97 100644 --- a/src/System.Security.Principal.Windows/ref/project.json +++ b/src/System.Security.Principal.Windows/ref/project.json @@ -1,15 +1,11 @@ { "dependencies": { - "System.Runtime": "4.0.0", - "System.Runtime.Handles": "4.0.0", - "System.Security.Claims": "4.0.0", - "System.Security.Principal": "4.0.0" + "System.Runtime": "4.4.0-beta-24617-03", + "System.Runtime.Handles": "4.4.0-beta-24617-03", + "System.Security.Claims": "4.4.0-beta-24617-03", + "System.Security.Principal": "4.4.0-beta-24617-03" }, "frameworks": { - "netstandard1.3": { - "imports": [ - "dotnet5.4" - ] - } + "netstandard1.7": {} } } diff --git a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.builds b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.builds index 0fae90886e..e25a9a21e5 100644 --- a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.builds +++ b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.builds @@ -9,7 +9,7 @@ <OSGroup>Unix</OSGroup> </Project> <Project Include="System.Security.Principal.Windows.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.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index 874d17b136..03c65c5408 100644 --- a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -8,17 +8,17 @@ <ProjectGuid>{F9E9894E-2513-4085-9046-311AD49D8AE6}</ProjectGuid> <AssemblyName>System.Security.Principal.Windows</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> - <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> + <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker> + <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the options --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" /> <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' AND '$(TargetsWindows)' == 'true'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" /> + <ItemGroup Condition="'$(TargetGroup)' != 'net463' AND '$(TargetsWindows)' == 'true'"> <Compile Include="Microsoft\Win32\SafeHandles\SafeAccessTokenHandle.cs" /> <Compile Include="Microsoft\Win32\SafeHandles\SafeSecurityHandles.cs" /> <Compile Include="System\Security\Principal\IdentityNotMappedException.cs" /> @@ -174,17 +174,14 @@ <Compile Include="$(CommonPath)\Interop\Windows\SecurityBase\Interop.AllocateLocallyUniqueId.cs"> <Link>Common\Interop\Windows\SecurityBase\Interop.AllocateLocallyUniqueId.cs</Link> </Compile> - <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs"> - <Link>Common\Microsoft\Win32\SafeHandlres\SafeHandleZeroOrMinusOneIsInvalid.cs</Link> - </Compile> <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs"> - <Link>Common\Microsoft\Win32\SafeHandlres\SafeLocalAllocHandle.cs</Link> + <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link> </Compile> <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeLsaHandle.cs"> - <Link>Common\Microsoft\Win32\SafeHandlres\SafeLsaHandle.cs</Link> + <Link>Common\Microsoft\Win32\SafeHandles\SafeLsaHandle.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> + <ItemGroup Condition="'$(TargetGroup)' == 'net463'"> <TargetingPackReference Include="mscorlib" /> </ItemGroup> <ItemGroup> diff --git a/src/System.Security.Principal.Windows/src/System/Security/Principal/IdentityNotMappedException.cs b/src/System.Security.Principal.Windows/src/System/Security/Principal/IdentityNotMappedException.cs index 6d9f465cb1..f8f2727692 100644 --- a/src/System.Security.Principal.Windows/src/System/Security/Principal/IdentityNotMappedException.cs +++ b/src/System.Security.Principal.Windows/src/System/Security/Principal/IdentityNotMappedException.cs @@ -4,7 +4,7 @@ namespace System.Security.Principal { - public sealed class IdentityNotMappedException : Exception + public sealed class IdentityNotMappedException : SystemException { private IdentityReferenceCollection _unmappedIdentities; diff --git a/src/System.Security.Principal.Windows/src/project.json b/src/System.Security.Principal.Windows/src/project.json index 5677955e38..d30145ede4 100644 --- a/src/System.Security.Principal.Windows/src/project.json +++ b/src/System.Security.Principal.Windows/src/project.json @@ -1,30 +1,29 @@ { "frameworks": { - "netstandard1.3": { + "netstandard1.7": { "dependencies": { "Microsoft.NETCore.Platforms": "1.2.0-beta-24617-03", - "Microsoft.Win32.Primitives": "4.0.0", - "System.Collections": "4.0.0", - "System.Diagnostics.Contracts": "4.0.0", - "System.Globalization": "4.0.0", - "System.Reflection": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.0", - "System.Runtime.Handles": "4.0.0", - "System.Runtime.InteropServices": "4.0.20", - "System.Security.Claims": "4.0.0", - "System.Security.Principal": "4.0.0", - "System.Text.Encoding": "4.0.10", - "System.Threading": "4.0.10" - }, - "imports": [ - "dotnet5.4" - ] + "Microsoft.Win32.Primitives": "4.4.0-beta-24617-03", + "System.Collections": "4.4.0-beta-24617-03", + "System.Diagnostics.Contracts": "4.4.0-beta-24617-03", + "System.Diagnostics.Debug": "4.4.0-beta-24617-03", + "System.Globalization": "4.4.0-beta-24617-03", + "System.Reflection": "4.4.0-beta-24617-03", + "System.Resources.ResourceManager": "4.4.0-beta-24617-03", + "System.Runtime": "4.4.0-beta-24617-03", + "System.Runtime.Extensions": "4.4.0-beta-24617-03", + "System.Runtime.Handles": "4.4.0-beta-24617-03", + "System.Runtime.InteropServices": "4.4.0-beta-24617-03", + "System.Security.Claims": "4.4.0-beta-24617-03", + "System.Security.Principal": "4.4.0-beta-24617-03", + "System.Text.Encoding": "4.4.0-beta-24617-03", + "System.Threading": "4.4.0-beta-24617-03", + "System.Threading.Tasks": "4.4.0-beta-24617-03" + } }, - "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.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds index 7e0b2d319f..ec4ae7216b 100644 --- a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds +++ b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds @@ -4,7 +4,7 @@ <ItemGroup> <Project Include="System.Security.Principal.Windows.Tests.csproj"> <OSGroup>Windows_NT</OSGroup> - <TestTFMs>netcore50;netcoreapp1.0;net46</TestTFMs> + <TestTFMs>netcore50;netcoreapp1.0;net46;netcoreapp1.1;net463</TestTFMs> </Project> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj index ffa5e6821d..59620cb190 100644 --- a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj +++ b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj @@ -11,7 +11,7 @@ <AssemblyName>System.Security.Principal.Windows.Tests</AssemblyName> <RootNamespace>System.Security.Principal.Windows.Tests</RootNamespace> <ProjectGuid>{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}</ProjectGuid> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> + <NugetTargetMoniker>.NETStandard,Version=v1.7</NugetTargetMoniker> </PropertyGroup> <ItemGroup> <Compile Include="WindowsIdentityTests.cs" /> diff --git a/src/System.Security.Principal.Windows/tests/project.json b/src/System.Security.Principal.Windows/tests/project.json index f8e02d8a41..14eb605576 100644 --- a/src/System.Security.Principal.Windows/tests/project.json +++ b/src/System.Security.Principal.Windows/tests/project.json @@ -15,14 +15,10 @@ "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02" }, "frameworks": { - "netstandard1.3": {} + "netstandard1.7": {} }, "supports": { - "coreFx.Test.netcore50": {}, - "coreFx.Test.netcoreapp1.0": {}, - "coreFx.Test.net46": {}, - "coreFx.Test.net461": {}, - "coreFx.Test.net462": {}, + "coreFx.Test.netcoreapp1.1": {}, "coreFx.Test.net463": {} } } diff --git a/src/System.Threading.Tasks/ref/System.Threading.Tasks.cs b/src/System.Threading.Tasks/ref/System.Threading.Tasks.cs index c0e034dc44..638206d58f 100644 --- a/src/System.Threading.Tasks/ref/System.Threading.Tasks.cs +++ b/src/System.Threading.Tasks/ref/System.Threading.Tasks.cs @@ -28,7 +28,7 @@ namespace System { - public partial class OperationCanceledException : System.Exception + public partial class OperationCanceledException : System.SystemException { public OperationCanceledException() { } public OperationCanceledException(string message) { } diff --git a/src/System.Threading.Tasks/src/ApiCompatBaseline.uap101aot.txt b/src/System.Threading.Tasks/src/ApiCompatBaseline.uap101aot.txt index effe814d63..802a222636 100644 --- a/src/System.Threading.Tasks/src/ApiCompatBaseline.uap101aot.txt +++ b/src/System.Threading.Tasks/src/ApiCompatBaseline.uap101aot.txt @@ -5,4 +5,6 @@ MembersMustExist : Member 'System.Threading.Tasks.Task.Dispose()' does not exist MembersMustExist : Member 'System.Threading.Tasks.Task.Dispose(System.Boolean)' does not exist in the implementation but it does exist in the contract. CannotRemoveBaseTypeOrInterface : Type 'System.Threading.Tasks.Task<TResult>' does not implement interface 'System.IDisposable' in the implementation but it does in the contract. MembersMustExist : Member 'System.Threading.Tasks.TaskCanceledException..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Threading.Tasks.TaskSchedulerException..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract.
\ No newline at end of file +MembersMustExist : Member 'System.Threading.Tasks.TaskSchedulerException..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.OperationCanceledException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract. +CannotRemoveBaseTypeOrInterface : Type 'System.Threading.Tasks.TaskCanceledException' does not inherit from base type 'System.SystemException' in the implementation but it does in the contract.
\ No newline at end of file diff --git a/src/System.Threading.Thread/ref/System.Threading.Thread.cs b/src/System.Threading.Thread/ref/System.Threading.Thread.cs index d1da736b12..eae1d29b84 100644 --- a/src/System.Threading.Thread/ref/System.Threading.Thread.cs +++ b/src/System.Threading.Thread/ref/System.Threading.Thread.cs @@ -48,7 +48,7 @@ namespace System.Threading } [System.Runtime.InteropServices.ComVisibleAttribute(true)] public delegate void ThreadStart(); - public sealed partial class ThreadStartException : System.Exception + public sealed partial class ThreadStartException : System.SystemException { internal ThreadStartException() { } } @@ -68,7 +68,7 @@ namespace System.Threading WaitSleepJoin = 32, } [System.Runtime.InteropServices.ComVisibleAttribute(true)] - public partial class ThreadStateException : System.Exception + public partial class ThreadStateException : System.SystemException { public ThreadStateException() { } public ThreadStateException(string message) { } diff --git a/src/System.Threading/ref/System.Threading.cs b/src/System.Threading/ref/System.Threading.cs index 421096c101..addbd3e302 100644 --- a/src/System.Threading/ref/System.Threading.cs +++ b/src/System.Threading/ref/System.Threading.cs @@ -8,7 +8,7 @@ namespace System.Threading { - public partial class AbandonedMutexException : System.Exception + public partial class AbandonedMutexException : System.SystemException { public AbandonedMutexException() { } public AbandonedMutexException(int location, System.Threading.WaitHandle handle) { } @@ -257,7 +257,7 @@ namespace System.Threading public int Release(int releaseCount) { throw null; } public static bool TryOpenExisting(string name, out System.Threading.Semaphore result) { throw null; } } - public partial class SemaphoreFullException : System.Exception + public partial class SemaphoreFullException : System.SystemException { public SemaphoreFullException() { } public SemaphoreFullException(string message) { } @@ -325,7 +325,7 @@ namespace System.Threading [System.Security.SecurityCriticalAttribute] public static void SetSynchronizationContext(System.Threading.SynchronizationContext syncContext) { } } - public partial class SynchronizationLockException : System.Exception + public partial class SynchronizationLockException : System.SystemException { public SynchronizationLockException() { } public SynchronizationLockException(string message) { } diff --git a/src/System.Threading/src/System.Threading.builds b/src/System.Threading/src/System.Threading.builds index 8e917c46ac..ff841102f7 100644 --- a/src/System.Threading/src/System.Threading.builds +++ b/src/System.Threading/src/System.Threading.builds @@ -6,11 +6,6 @@ <Project Include="System.Threading.csproj"> <TargetGroup>net463</TargetGroup> </Project> - <!-- Net46 facade is currently inbox for 4.0 - <Project Include="System.Threading.csproj"> - <TargetGroup>net46</TargetGroup> - </Project> - --> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project> |