Add back support for deserialization of BinaryFormatted resources #20907

ericstj · 2018-11-09T08:07:41Z

This adds back support for using BinaryFormatter to deserialize resources when loaded
from assembly.

We conditionally load BinaryFormatter and will throw if asked to deserialize binary formatted
resources and cannot find it.

I'll put up a CoreFx PR shortly with tests.

This adds back support for using BinaryFormatter to deserialize resources when loaded from assembly. We conditionally load BinaryFormatter and will throw if asked to deserialize binary formatted resources and cannot find it.

src/System.Private.CoreLib/shared/System/Resources/ResourceReader.cs

src/System.Private.CoreLib/Resources/Strings.resx

src/System.Private.CoreLib/shared/System/Resources/ResourceReader.cs

Changes lazy initialization to use LazyInitializer Remove special handling of missing serialization assembly. Clean up comments,

src/System.Private.CoreLib/src/System/Resources/ManifestBasedResourceGroveler.cs

jkotas

Thanks for getting this unblocked!

src/System.Private.CoreLib/src/System/Resources/ManifestBasedResourceGroveler.cs

stephentoub

Thanks, Eric!

ericstj · 2018-11-09T18:34:50Z

test CentOS7.1 x64 Checked Innerloop Build and Test

ericstj · 2018-11-09T18:36:36Z

test OSX10.12 x64 Checked Innerloop Build and Test

mmitche · 2018-11-09T22:04:08Z

@dotnet-bot test this please

src/System.Private.CoreLib/shared/System/Resources/ResourceReader.cs

src/System.Private.CoreLib/src/System/Resources/ManifestBasedResourceGroveler.cs

ericstj · 2018-11-10T00:24:37Z

Test Windows_NT x64 Checked CoreFx Tests

danmoseley · 2018-11-10T01:15:45Z

src/System.Private.CoreLib/shared/System/Resources/RuntimeResourceSet.cs

@@ -195,14 +195,14 @@ internal RuntimeResourceSet(string fileName) : base(false)
        {
            _resCache = new Dictionary<string, ResourceLocator>(FastResourceComparer.Default);
            Stream stream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
-            _defaultReader = new ResourceReader(stream, _resCache);
+            _defaultReader = new ResourceReader(stream, _resCache, false);


nit permitDeserialization:false ?

Concerns addressed

…tnet/coreclr#20907) * Add back support for deserialization of BinaryFormatted resources This adds back support for using BinaryFormatter to deserialize resources when loaded from assembly. We conditionally load BinaryFormatter and will throw if asked to deserialize binary formatted resources and cannot find it. * Apply code-review feedback Changes lazy initialization to use LazyInitializer Remove special handling of missing serialization assembly. Clean up comments, * Use named parameter when specifying permitDeserialization Commit migrated from dotnet/coreclr@791332b

ericstj requested review from GrabYourPitchforks, stephentoub, ViktorHofer and tarekgh November 9, 2018 08:07

ericstj mentioned this pull request Nov 9, 2018

Add tests for binaryFormatted resources dotnet/corefx#33361

Merged

jkotas requested a review from morganbr November 9, 2018 13:53

jkotas reviewed Nov 9, 2018

View reviewed changes