Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend PayloadReader APIs to meet the WinForms requirements #11341

Open
wants to merge 14 commits into
base: SafePayloadReader
Choose a base branch
from
Open

Extend PayloadReader APIs to meet the WinForms requirements #11341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b59abfd
extend PayloadReader public API surface:
adamsitnik May 9, 2024
297381c
extend PayloadReader public API surface:
adamsitnik May 10, 2024
25e123e
switch to the new API (System.Private.Windows.Core compiles)
adamsitnik May 10, 2024
c6f612d
remove code that won't be needed for reading, move code that will be …
adamsitnik May 10, 2024
ce67096
- update test project so it compiles
adamsitnik May 13, 2024
045baed
fix the bugs:
adamsitnik May 14, 2024
7f409ae
disable some of the FormatterTypeStyle.TypesWhenNeeded tests (this ne…
adamsitnik May 14, 2024
85c01ff
move the payload reader code to separate project to ensure we are not…
adamsitnik May 14, 2024
7b7d485
silence the compiler warnings
adamsitnik May 14, 2024
c88443f
MemberReferenceRecord does not need to be public
adamsitnik May 14, 2024
c63a18c
rename ClassRecord.GetObject to GetRawValue
adamsitnik May 14, 2024
a8af796
polishing after reading the code again
adamsitnik May 14, 2024
f9e1aee
address code review feedback:
adamsitnik May 15, 2024
a3043a2
address API review feedback: expose LibraryName via TypeName.Assembly…
adamsitnik May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions Winforms.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrimTestBinaryDeserializati
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinaryFormatTests", "src\System.Private.Windows.Core\tests\BinaryFormatTests\BinaryFormatTests.csproj", "{57EC5288-9513-46CF-8FB7-626199690D90}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.BinaryFormat", "src\System.Runtime.Serialization.BinaryFormat\System.Runtime.Serialization.BinaryFormat.csproj", "{DC3DD357-7FB4-4384-92DC-5D34864D010B}"
adamsitnik marked this conversation as resolved.
Show resolved Hide resolved
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -981,6 +983,22 @@ Global
{57EC5288-9513-46CF-8FB7-626199690D90}.Release|x64.Build.0 = Release|Any CPU
{57EC5288-9513-46CF-8FB7-626199690D90}.Release|x86.ActiveCfg = Release|Any CPU
{57EC5288-9513-46CF-8FB7-626199690D90}.Release|x86.Build.0 = Release|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Debug|arm64.ActiveCfg = Debug|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Debug|arm64.Build.0 = Debug|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Debug|x64.ActiveCfg = Debug|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Debug|x64.Build.0 = Debug|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Debug|x86.ActiveCfg = Debug|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Debug|x86.Build.0 = Debug|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Release|Any CPU.Build.0 = Release|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Release|arm64.ActiveCfg = Release|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Release|arm64.Build.0 = Release|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Release|x64.ActiveCfg = Release|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Release|x64.Build.0 = Release|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Release|x86.ActiveCfg = Release|Any CPU
{DC3DD357-7FB4-4384-92DC-5D34864D010B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1044,6 +1062,7 @@ Global
{55F3174F-C1FE-4C8F-AF71-2512630088F8} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
{CFBCC732-C988-4FE7-A21B-98A142365374} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A}
{57EC5288-9513-46CF-8FB7-626199690D90} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
{DC3DD357-7FB4-4384-92DC-5D34864D010B} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136}
Expand Down
7 changes: 4 additions & 3 deletions src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@

<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" PrivateAssets="all" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="9.0.0-preview.4.24225.2" />
<PackageReference Include="System.IO.Hashing" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\System.Runtime.Serialization.BinaryFormat\System.Runtime.Serialization.BinaryFormat.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
49 changes: 0 additions & 49 deletions ...dows.Core/src/System.Runtime.Serialization.BinaryFormat/Records/ClassWithMembersRecord.cs
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions ...ore/src/System.Runtime.Serialization.BinaryFormat/Records/SystemClassWithMembersRecord.cs
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions ...tem.Private.Windows.Core/src/System.Runtime.Serialization.BinaryFormat/Utils/RecordMap.cs
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions ...ystem.Private.Windows.Core/src/System/Windows/Forms/BinaryFormat/ArrayRecordExtensions.cs
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions ...ivate.Windows.Core/src/System/Windows/Forms/BinaryFormat/BinaryArray.ObjectBinaryArray.cs
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions ...te.Windows.Core/src/System/Windows/Forms/BinaryFormat/BinaryArray.PrimitiveBinaryArray.cs
View file
Open in desktop

This file was deleted.