From e5b74790af470a2135ef34f62eba0cd802a1ecdf Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Tue, 7 Jul 2020 17:49:14 -0400
Subject: [PATCH 1/2] [Wasm] Modify System.IO.IsolatedStorage to throw PNSE

---
 .../System.IO.IsolatedStorage/src/Resources/Strings.resx | 5 ++++-
 .../src/System.IO.IsolatedStorage.csproj                 | 9 ++++++---
 .../System.IO.IsolatedStorage/tests/AssemblyInfo.cs      | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/libraries/System.IO.IsolatedStorage/src/Resources/Strings.resx b/src/libraries/System.IO.IsolatedStorage/src/Resources/Strings.resx
index 8220d576e086a0..8c1775ac8c32ee 100644
--- a/src/libraries/System.IO.IsolatedStorage/src/Resources/Strings.resx
+++ b/src/libraries/System.IO.IsolatedStorage/src/Resources/Strings.resx
@@ -140,5 +140,8 @@
   </data>
   <data name="PlatformNotSupported_CAS" xml:space="preserve">
     <value>Code Access Security is not supported on this platform.</value>
-  </data>  
+  </data>
+  <data name="PlatformNotSupported_Browser" xml:space="preserve">
+    <value>System.IO.IsolatedStorage is not supported on Browser.</value>
+  </data>
 </root>
diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
index 4771f9f572c729..f71f5f8a6252cc 100644
--- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
@@ -3,7 +3,10 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
 	<Nullable>enable</Nullable>
   </PropertyGroup>
-  <ItemGroup>
+  <PropertyGroup>
+    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsBrowser)' == 'true'">SR.PlatformNotSupported_Browser</GeneratePlatformNotSupportedAssemblyMessage>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetsBrowser)' != 'true'">
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageException.cs" />
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageFile.cs" />
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageFileStream.cs" />
@@ -18,10 +21,10 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="System\IO\IsolatedStorage\Helper.Win32.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsUnix)' == 'true' or '$(TargetsBrowser)' == 'true'">
+  <ItemGroup Condition="'$(TargetsUnix)' == 'true' and '$(TargetsBrowser)' != 'true'">
     <Compile Include="System\IO\IsolatedStorage\Helper.Unix.cs" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetsBrowser)' != 'true'">
     <Reference Include="System.IO.FileSystem" />
     <Reference Include="System.Linq" />
     <Reference Include="System.Runtime" />
diff --git a/src/libraries/System.IO.IsolatedStorage/tests/AssemblyInfo.cs b/src/libraries/System.IO.IsolatedStorage/tests/AssemblyInfo.cs
index 9f1f18cb9e6d62..6ad354529211ae 100644
--- a/src/libraries/System.IO.IsolatedStorage/tests/AssemblyInfo.cs
+++ b/src/libraries/System.IO.IsolatedStorage/tests/AssemblyInfo.cs
@@ -9,3 +9,4 @@
 // create unique identities for every test to allow every test to have
 // it's own store.
 [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true)]
+[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]

From 8e1fc0b13ea315338bd446d4297ea4fc4e24e880 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 8 Jul 2020 08:54:33 -0400
Subject: [PATCH 2/2] Feedback

---
 .../src/Resources/Strings.resx                     |  4 ++--
 .../src/System.IO.IsolatedStorage.csproj           | 14 ++++++++------
 .../tests/AssemblyInfo.cs                          |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/libraries/System.IO.IsolatedStorage/src/Resources/Strings.resx b/src/libraries/System.IO.IsolatedStorage/src/Resources/Strings.resx
index 8c1775ac8c32ee..7575c8e979de03 100644
--- a/src/libraries/System.IO.IsolatedStorage/src/Resources/Strings.resx
+++ b/src/libraries/System.IO.IsolatedStorage/src/Resources/Strings.resx
@@ -141,7 +141,7 @@
   <data name="PlatformNotSupported_CAS" xml:space="preserve">
     <value>Code Access Security is not supported on this platform.</value>
   </data>
-  <data name="PlatformNotSupported_Browser" xml:space="preserve">
-    <value>System.IO.IsolatedStorage is not supported on Browser.</value>
+  <data name="IsolatedStorage_PlatformNotSupported" xml:space="preserve">
+    <value>System.IO.IsolatedStorage is not supported on this platform.</value>
   </data>
 </root>
diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
index f71f5f8a6252cc..75bb5e2176c738 100644
--- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
 	<Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsBrowser)' == 'true'">SR.PlatformNotSupported_Browser</GeneratePlatformNotSupportedAssemblyMessage>
+    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsAnyOS)' == 'true'">SR.IsolatedStorage_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetsBrowser)' != 'true'">
+  <ItemGroup Condition="'$(TargetsAnyOS)' != 'true'">
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageException.cs" />
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageFile.cs" />
     <Compile Include="System\IO\IsolatedStorage\IsolatedStorageFileStream.cs" />
@@ -21,18 +21,20 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="System\IO\IsolatedStorage\Helper.Win32.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsUnix)' == 'true' and '$(TargetsBrowser)' != 'true'">
+  <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="System\IO\IsolatedStorage\Helper.Unix.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsBrowser)' != 'true'">
+  <ItemGroup Condition="'$(TargetsAnyOS)' != 'true'">
     <Reference Include="System.IO.FileSystem" />
     <Reference Include="System.Linq" />
-    <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Extensions" />
     <Reference Include="System.Security.Cryptography.Algorithms" />
     <Reference Include="System.Security.Cryptography.Primitives" />
     <Reference Include="System.Threading" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Runtime" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Reference Include="System.IO.FileSystem.AccessControl" />
     <Reference Include="System.Security.AccessControl" />
diff --git a/src/libraries/System.IO.IsolatedStorage/tests/AssemblyInfo.cs b/src/libraries/System.IO.IsolatedStorage/tests/AssemblyInfo.cs
index 6ad354529211ae..9a2e6238fb54a4 100644
--- a/src/libraries/System.IO.IsolatedStorage/tests/AssemblyInfo.cs
+++ b/src/libraries/System.IO.IsolatedStorage/tests/AssemblyInfo.cs
@@ -9,4 +9,4 @@
 // create unique identities for every test to allow every test to have
 // it's own store.
 [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true)]
-[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
+[assembly: SkipOnMono("System.IO.IsolatedStorage is not supported on Browser", TestPlatforms.Browser)]