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

Add reference assembly for System.Private.CoreLib.dll #72143

Merged
merged 26 commits into from
Aug 2, 2022
Merged

Add reference assembly for System.Private.CoreLib.dll #72143

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e6a14f2
Add reference assembly for System.Private.CoreLib.dll
akoeplinger Jul 13, 2022
7aa87e4
PR feedback
akoeplinger Jul 14, 2022
089738f
Disable compiling against SPC ref assembly for NativeAOT System.Priva…
akoeplinger Jul 14, 2022
b3bc03a
Revert changes that turned out to not be necessary
akoeplinger Jul 14, 2022
a15219f
Apply suggestions from code review
akoeplinger Jul 14, 2022
a435769
PR feedback
akoeplinger Jul 14, 2022
2c543f7
Fix build of System.Diagnostics.Debug.Tests.csproj
akoeplinger Jul 14, 2022
e48f215
Don't binplace System.Private.CoreLib ref assembly
akoeplinger Jul 14, 2022
686c578
Move contract .cs files back into the contract's ref\ directory
akoeplinger Jul 14, 2022
4c11ede
Add ApiCompat run for System.Private.CoreLib ref<->impl
akoeplinger Jul 14, 2022
9fb1ec2
Fix ApiCompat differences
akoeplinger Jul 14, 2022
928ef61
Better fix for wasm threading ApiCompat errors
akoeplinger Jul 15, 2022
76c7308
Revert unnecessary changes
akoeplinger Jul 15, 2022
9674d4c
Add comment
akoeplinger Jul 15, 2022
0e8122b
Disable binplacing with existing property
akoeplinger Jul 15, 2022
cd09cf2
Move CoreLib apicompat run to src projects
akoeplinger Jul 15, 2022
ecbde50
Fix ApiCompat issues by adding baseline files
akoeplinger Jul 15, 2022
1d28a85
PR feedback
akoeplinger Jul 15, 2022
d137fa3
Updates based on latest GenAPI changes
akoeplinger Jul 29, 2022
4ebf355
Merge remote-tracking branch 'upstream/main' into corelib-ref-assembly
akoeplinger Jul 29, 2022
5b7e29e
Update MatchingRefApiCompatBaseline.txt with recent changes
akoeplinger Jul 29, 2022
15398a9
Update MatchingRefApiCompatBaseline.txt with recent changes
akoeplinger Jul 29, 2022
bca5a1b
Fix MatchingRefApiCompatBaseline.txt validation failing on Windows
akoeplinger Jul 29, 2022
913329c
Update GenAPI
akoeplinger Aug 1, 2022
3600348
Remove MatchingRefApiCompatBaseline.Unix.txt
akoeplinger Aug 1, 2022
e947b5f
Merge remote-tracking branch 'upstream/main' into corelib-ref-assembly
akoeplinger Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/coreclr/System.Private.CoreLib/MatchingRefApiCompatBaseline.Unix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation.
1 change: 0 additions & 1 deletion src/coreclr/System.Private.CoreLib/MatchingRefApiCompatBaseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInf
CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name' is abstract in the reference but is not abstract in the implementation.
CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInfo.Exists.get()' is abstract in the reference but is not abstract in the implementation.
CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation.
TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'protected System.ModuleHandle System.Reflection.Module.GetModuleHandleImpl()' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'protected System.ModuleHandle System.Reflection.Emit.ModuleBuilder.GetModuleHandleImpl()' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'protected System.String System.String System.Resources.ResourceManager.BaseNameField' does not exist in the reference but it does exist in the implementation.
Expand Down
3 changes: 3 additions & 0 deletions src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@
<IsSourceProject>true</IsSourceProject>
<ApiCompatValidateBaseline>true</ApiCompatValidateBaseline>
</PropertyGroup>
<ItemGroup>
<MatchingRefApiCompatBaseline Condition="'$(TargetsWindows)' != 'true'" Include="MatchingRefApiCompatBaseline.Unix.txt" />
</ItemGroup>
<Import Project="$(RepositoryEngineeringDir)resolveContract.props" />
<Import Project="$(RepositoryEngineeringDir)resolveContract.targets" />
</Project>
1 change: 1 addition & 0 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/MatchingRefApiCompatBaseline.Unix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation.
4 changes: 2 additions & 2 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/MatchingRefApiCompatBaseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInf
CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name' is abstract in the reference but is not abstract in the implementation.
CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInfo.Exists.get()' is abstract in the reference but is not abstract in the implementation.
CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation.
TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation.
TypesMustExist : Type 'System.Reflection.AssemblyRuntimeNameHelpers' does not exist in the reference but it does exist in the implementation.
TypesMustExist : Type 'System.Reflection.BinderBundle' does not exist in the reference but it does exist in the implementation.
TypesMustExist : Type 'System.Reflection.DelegateDynamicInvokeInfo' does not exist in the reference but it does exist in the implementation.
TypesMustExist : Type 'System.Reflection.EnumInfo' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'public System.Reflection.ParameterInfo[] System.Reflection.MethodBase.GetParametersNoCopy()' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'public System.Reflection.MethodBase System.Reflection.MethodBase.MetadataDefinitionMethod.get()' does not exist in the reference but it does exist in the implementation.
Expand Down Expand Up @@ -268,4 +268,4 @@ MembersMustExist : Member 'public void System.Runtime.Serialization.Serializatio
MembersMustExist : Member 'public void System.Runtime.Serialization.SerializationInfo.UpdateValue(System.String, System.Object, System.Type)' does not exist in the reference but it does exist in the implementation.
TypesMustExist : Type 'System.Threading.Condition' does not exist in the reference but it does exist in the implementation.
TypesMustExist : Type 'System.Threading.Lock' does not exist in the reference but it does exist in the implementation.
TypesMustExist : Type 'System.Threading.LockHolder' does not exist in the reference but it does exist in the implementation.
TypesMustExist : Type 'System.Threading.LockHolder' does not exist in the reference but it does exist in the implementation.
3 changes: 3 additions & 0 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,9 @@
<IsSourceProject>true</IsSourceProject>
<ApiCompatValidateBaseline>true</ApiCompatValidateBaseline>
</PropertyGroup>
<ItemGroup>
<MatchingRefApiCompatBaseline Condition="'$(TargetsWindows)' != 'true'" Include="MatchingRefApiCompatBaseline.Unix.txt" />
</ItemGroup>
<Import Project="$(RepositoryEngineeringDir)resolveContract.props" />
<Import Project="$(RepositoryEngineeringDir)resolveContract.targets" />
</Project>
1 change: 1 addition & 0 deletions src/mono/System.Private.CoreLib/MatchingRefApiCompatBaseline.Unix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation.
1 change: 0 additions & 1 deletion src/mono/System.Private.CoreLib/MatchingRefApiCompatBaseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInf
CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name' is abstract in the reference but is not abstract in the implementation.
CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInfo.Exists.get()' is abstract in the reference but is not abstract in the implementation.
CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation.
TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'protected System.ModuleHandle System.Reflection.Module.GetModuleHandleImpl()' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'protected System.ModuleHandle System.Reflection.Emit.ModuleBuilder.GetModuleHandleImpl()' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'protected System.String System.String System.Resources.ResourceManager.BaseNameField' does not exist in the reference but it does exist in the implementation.
Expand Down
3 changes: 3 additions & 0 deletions src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,9 @@
<IsSourceProject>true</IsSourceProject>
<ApiCompatValidateBaseline>true</ApiCompatValidateBaseline>
</PropertyGroup>
<ItemGroup>
<MatchingRefApiCompatBaseline Condition="'$(TargetsWindows)' != 'true'" Include="MatchingRefApiCompatBaseline.Unix.txt" />
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
<Import Project="$(RepositoryEngineeringDir)resolveContract.props" />
<Import Project="$(RepositoryEngineeringDir)resolveContract.targets" />

Expand Down