Add System.SystemException derivations

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": {

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) {
+        }
+    }
+}

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>

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.
+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.

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>

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"
       }
     }
   }

src/System.IO/ref/System.IO.cs

@@ -163,7 +163,7 @@ public EndOfStreamException() { }
         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) { }

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.
+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.

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>

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)

src/System.Net.Security/ref/System.Net.Security.cs

@@ -142,7 +142,7 @@ public override void Write(byte[] buffer, int offset, int count) { }
 }
 namespace System.Security.Authentication
 {
-    public partial class AuthenticationException : System.Exception
+    public partial class AuthenticationException : System.SystemException
     {
         public AuthenticationException() { }
         public AuthenticationException(string message) { }

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) { }

src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SerializationException.cs

@@ -6,7 +6,7 @@
 
 namespace System.Runtime.Serialization
 {
-    public class SerializationException : Exception
+    public class SerializationException : SystemException
     {
         public SerializationException() { }
 

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" />

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)

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"
       }
     }
   }

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 @@ public InterfaceTypeAttribute(short interfaceType) { }
         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 @@ public MarshalAsAttribute(short unmanagedType) { }
         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 @@ public sealed partial class PreserveSigAttribute : System.Attribute
     {
         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) { }

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.

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>