Skip to content

Merging small assemblies (part 1/N)#2189

Merged
jkotas merged 21 commits intodotnet:masterfrom
jkotas:merges
Jan 29, 2020
Merged

Merging small assemblies (part 1/N)#2189
jkotas merged 21 commits intodotnet:masterfrom
jkotas:merges

Conversation

@jkotas
Copy link
Member

@jkotas jkotas commented Jan 25, 2020

Contributes to #2138

jkotas added 19 commits January 25, 2020 10:15
@jkotas
Delete unnecessary ClsCompliant
b4660af
@jkotas
Merge System.Diagnostics.Tools\src into CoreLib
13c0852
@jkotas
Merge System.Security.Pricipal\src into CoreLib
a8ccf21
@jkotas
Delete System.IO.UnmanagedMemoryStream\ref\System.IO.UnmanagedMemoryS…
f2a1d07 
…tream.cs
@jkotas
Delete System.Reflection\ref\System.Reflection.cs
6c89431
@jkotas
Delete System.Threading.Timer\src\ApiCompatBaseline.uapaot.txt
becf418
@jkotas
Delete System.Buffers\src\Resources\Strings.resx
278f39b
@jkotas
Merge System.Buffers\ref into System.Runtime
3443b87
@jkotas
Merge System.Diagnostics.Debug\ref into System.Runtime
4a02682
@jkotas
Delete *\MatchingRefApiCompatBaseline.txt
fb97efc
@jkotas
Merge System.Diagnostics.Tools into System.Runtime\ref
87abbb7
@jkotas
Delete unnecessary references
724832f
@jkotas
Merge System.Resources.ResourceManager into System.Runtime\ref
430b93d
@jkotas
Cleanup System.IO.* project references
dd0f055
@jkotas
Cleanup System.Reflection project references
5d57fca
@jkotas
Cleanup System.Runtime.Handles project references
6e9729c
@jkotas
Merge System.Threading.Thread\src into CoreLib
aed8fdb
@jkotas
Merge System.Threading.Timer\ref into System.Runtime
8c3a8d1
@jkotas
Merge System.Threading.Tasks\ref into System.Runtime
35a5f31
@benaadams
Copy link
Member

benaadams commented Jan 27, 2020

Merge conflict with System.Net.Http.csproj

ericstj
ericstj reviewed Jan 27, 2020
View reviewed changes
src/libraries/System.Runtime/ref/System.Runtime.cs
public bool IsError { get { throw null; } }
public string? Message { get { throw null; } }
}
public partial class OperationCanceledException : System.SystemException
Copy link
Member

@ericstj ericstj Jan 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should start segmenting this file by namespace. I believe GenAPI has an option for that. Probably not in this PR.

@jkotas jkotas mentioned this pull request Jan 27, 2020
Closed
@jkotas
Copy link
Member Author

jkotas commented Jan 28, 2020

@maryamariyan @ericstj Could you please sign off on this PR if it looks good to you?

@jkotas
Copy link
Member Author

jkotas commented Jan 29, 2020

@ericstj Thank you!

@jkotas jkotas merged commit 099a512 into dotnet:master Jan 29, 2020
@ericstj
Copy link
Member

ericstj commented Jan 29, 2020

Thank you for the change! Looking forward to deleting more.

@safern
Copy link
Member

safern commented Jan 31, 2020

This is breaking people upstack: dotnet/razor#1551

MSB4018: The "RazorTagHelper" task failed unexpectedly. 
[F:\workspace\_work\1\s\artifacts\tmp\Release\Razor\txwy4p0j.jou\ClassLibrary\ClassLibrary.csproj]\r\nF:\workspace\_work\1\s\src\Razor\src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Microsoft.NET.Sdk.Razor.CodeGeneration.targets(99,5): error MSB4018: System.TypeLoadException: Could not load type 'System.Diagnostics.Debugger' from assembly 'System.Runtime, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. 
[F:\workspace\_work\1\s\artifacts\tmp\Release\Razor\txwy4p0j.jou\ClassLibrary\ClassLibrary.csproj]\r\nF:\workspace\_work\1\s\src\Razor\src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Microsoft.NET.Sdk.Razor.CodeGeneration.targets(99,5): error MSB4018: at Microsoft.AspNetCore.Razor.Tasks.DotNetToolTask.Execute() 
[F:\workspace\_work\1\s\artifacts\tmp\Release\Razor\txwy4p0j.jou\ClassLibrary\ClassLibrary.csproj]\r\nF:\workspace\_work\1\s\src\Razor\src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Microsoft.NET.Sdk.Razor.CodeGeneration.targets(99,5): error MSB4018: at Microsoft.Build.BackEnd.TaskExecutionHost.Microsoft.Build.BackEnd.ITaskExecutionHost.Execute() 
[F:\workspace\_work\1\s\artifacts\tmp\Release\Razor\txwy4p0j.jou\ClassLibrary\ClassLibrary.csproj]\r\nF:\workspace\_work\1\s\src\Razor\src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Microsoft.NET.Sdk.Razor.CodeGeneration.targets(99,5): error MSB4018: at Microsoft.Build.BackEnd.TaskBuilder.ExecuteInstantiatedTask(ITaskExecutionHost taskExecutionHost, TaskLoggingContext taskLoggingContext, TaskHost taskHost, ItemBucket bucket, TaskExecutionMode howToExecuteTask) 
[F:\workspace\_work\1\s\artifacts\tmp\Release\Razor\txwy4p0j.jou\ClassLibrary\ClassLib

It seems like the source assemblies are still forwarding to System.Private.Corelib... shouldn't they forward to System.Runtime to unify ref and implementation?

@ericstj
Copy link
Member

ericstj commented Jan 31, 2020

Looks to me like they are building against latest and running against older version.

@ericstj
Copy link
Member

ericstj commented Jan 31, 2020

Looks like @jkotas reached the same conclusion in that issue.

@jkotas jkotas deleted the merges branch February 1, 2020 19:35
@jkotas jkotas mentioned this pull request Feb 6, 2020
Closed
@ghost ghost locked as resolved and limited conversation to collaborators Dec 11, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ericstj ericstj ericstj approved these changes

+1 more reviewer

@maryamariyan maryamariyan maryamariyan left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@ericstj ericstj

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jkotas @benaadams @ericstj @safern @maryamariyan