Skip to content

Merging small assemblies (part 2/N) #31991

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

Merged
jkotas merged 17 commits into from
Feb 18, 2020
Merged

Merging small assemblies (part 2/N) #31991

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e2b2427
Move System.Runtime\src to CoreLib
jkotas Feb 7, 2020
2c3ee0b
Move System.Runtime.Extensions/src to CoreLib
jkotas Feb 7, 2020
116be6b
Fix build break
jkotas Feb 7, 2020
2d7a5b6
Refresh ref/System.Runtime.cs
jkotas Feb 7, 2020
4ae8b59
Merge System.Security.Principal/ref into System.Runtime
jkotas Feb 8, 2020
2949723
Move System.Runtime.Extensions/ref to System.Runtime/ref
jkotas Feb 8, 2020
5ecbe58
Fix build
jkotas Feb 9, 2020
59284bf
Fix conflicts
jkotas Feb 9, 2020
17684bd
Fix binary serialization of SwitchExpressionException
jkotas Feb 9, 2020
c15ddfc
Fix ALC tests
jkotas Feb 9, 2020
39dc099
Fix annotation
jkotas Feb 9, 2020
e94db10
Merge branch 'master' into merges
jkotas Feb 9, 2020
3f0f956
Merge branch 'master' into merges
jkotas Feb 12, 2020
b0b3d61
Merge branch 'master' into merges
jkotas Feb 18, 2020
598ad48
Fix build break
jkotas Feb 18, 2020
9684c4c
Apply change from master
jkotas Feb 18, 2020
bae4b2a
Nullable build breaks
jkotas Feb 18, 2020
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
Prev Previous commit
Next Next commit
Fix build
  • Loading branch information
@jkotas
jkotas committed Feb 9, 2020
commit 5ecbe58fa0f9d14ebabc924918da195795661126
3 changes: 1 addition & 2 deletions src/libraries/System.Runtime.Extensions/src/MatchingRefApiCompatBaseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Compat issues with assembly System.Runtime.Extensions:
MembersMustExist : Member 'System.AppDomain.GetThreadPrincipal()' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.Environment.FailFast(System.String, System.Exception, System.String)' does not exist in the reference but it does exist in the implementation.
Total Issues: 5
Total Issues: 1
10 changes: 1 addition & 9 deletions src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.0'">4.0.0.0</AssemblyVersion>
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.2'">4.0.11.0</AssemblyVersion>
<DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);FEATURE_APPX</DefineConstants>
<TargetFrameworks>netstandard1.0;netstandard1.2;netstandard2.0;netcoreapp3.0-Windows_NT;$(NetCoreAppCurrent)-Windows_NT</TargetFrameworks>
<TargetFrameworks>netstandard1.0;netstandard1.2;netstandard2.0;$(NetCoreAppCurrent)-Windows_NT</TargetFrameworks>
<ExcludeCurrentNetCoreApp>true</ExcludeCurrentNetCoreApp>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetsNetStandard)' == 'true'">
Expand All @@ -21,14 +21,6 @@
<Reference Include="Windows" />
<ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ReferenceFromRuntime Include="System.Runtime" />
<ReferenceFromRuntime Include="System.Runtime.Extensions" />
<ReferenceFromRuntime Include="System.Diagnostics.Debug" />
<ReferenceFromRuntime Include="System.Diagnostics.Tools" />
<ReferenceFromRuntime Include="System.Runtime.InteropServices.WindowsRuntime" />
<ReferenceFromRuntime Include="System.ObjectModel" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
<ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
<ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
Expand Down
2 changes: 2 additions & 0 deletions ...ntime/src/System/Runtime/InteropServices/WindowsRuntime/WindowsRuntimeBufferExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,8 @@ public static IBuffer GetWindowsRuntimeBuffer(this MemoryStream underlyingStream
/// length end, or zero if <code>positionInStream</code> is beyond stream length end, but not more than <code>length</code>.
/// </summary>
/// <param name="underlyingStream">A memory stream to share the data memory with the buffer being created.</param>
/// <param name="positionInStream">The position of the shared memory region.</param>
/// <param name="length">The maximum size of the shared memory region.</param>
/// <returns>A new <code>IBuffer</code> backed by the same memory as this specified stream.</returns>
[CLSCompliant(false)]
public static IBuffer GetWindowsRuntimeBuffer(this MemoryStream underlyingStream, int positionInStream, int length)
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ MembersMustExist : Member 'System.AppContext.remove_FirstChanceException(System.
MembersMustExist : Member 'System.AppContext.remove_ProcessExit(System.EventHandler)' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.AppContext.remove_UnhandledException(System.UnhandledExceptionEventHandler)' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.AppContext.SetData(System.String, System.Object)' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.Environment.FailFast(System.String, System.Exception, System.String)' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.WeakReference..ctor()' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.Diagnostics.Debug.SetProvider(System.Diagnostics.DebugProvider)' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.Reflection.Module.GetModuleHandleImpl()' does not exist in the reference but it does exist in the implementation.
Expand All @@ -16,4 +17,4 @@ MembersMustExist : Member 'System.Runtime.Serialization.SerializationInfo.StartD
MembersMustExist : Member 'System.Runtime.Serialization.SerializationInfo.ThrowIfDeserializationInProgress()' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.Runtime.Serialization.SerializationInfo.ThrowIfDeserializationInProgress(System.String, System.Int32)' does not exist in the reference but it does exist in the implementation.
MembersMustExist : Member 'System.Runtime.Serialization.SerializationInfo.UpdateValue(System.String, System.Object, System.Type)' does not exist in the reference but it does exist in the implementation.
Total Issues: 17
Total Issues: 18