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 all commits
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
10 changes: 5 additions & 5 deletions src/libraries/System.Diagnostics.Process/src/System/Diagnostics/PerformanceCounterLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ internal byte[] GetPerformanceData(string item)
}
}

return _performanceMonitor.GetData(item);
return _performanceMonitor.GetData(item)!;
}

private Dictionary<int, string> GetStringTable(bool isHelp)
Expand Down Expand Up @@ -113,9 +113,9 @@ private Dictionary<int, string> GetStringTable(bool isHelp)
try
{
if (!isHelp)
names = (string[])libraryKey.GetValue("Counter " + _perfLcid);
names = (string[]?)libraryKey.GetValue("Counter " + _perfLcid);
else
names = (string[])libraryKey.GetValue("Explain " + _perfLcid);
names = (string[]?)libraryKey.GetValue("Explain " + _perfLcid);

if ((names == null) || (names.Length == 0))
{
Expand Down Expand Up @@ -225,7 +225,7 @@ private void Init()
// we wait may not be sufficient if the Win32 code keeps running into this deadlock again
// and again. A condition very rare but possible in theory. We would get back to the user
// in this case with InvalidOperationException after the wait time expires.
internal byte[] GetData(string item)
internal byte[]? GetData(string item)
{
#if FEATURE_REGISTRY
int waitRetries = 17; //2^16*10ms == approximately 10mins
Expand All @@ -237,7 +237,7 @@ internal byte[] GetData(string item)
{
try
{
data = (byte[])_perfDataKey.GetValue(item);
data = (byte[]?)_perfDataKey.GetValue(item);
return data;
}
catch (IOException e)
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessStartInfo.Win32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public string[] Verbs
if (string.IsNullOrEmpty(extension))
return Array.Empty<string>();

using (RegistryKey key = Registry.ClassesRoot.OpenSubKey(extension))
using (RegistryKey? key = Registry.ClassesRoot.OpenSubKey(extension))
{
if (key == null)
return Array.Empty<string>();
Expand All @@ -27,7 +27,7 @@ public string[] Verbs
if (string.IsNullOrEmpty(value))
return Array.Empty<string>();

using (RegistryKey subKey = Registry.ClassesRoot.OpenSubKey(value + "\\shell"))
using (RegistryKey? subKey = Registry.ClassesRoot.OpenSubKey(value + "\\shell"))
{
if (subKey == null)
return Array.Empty<string>();
Expand Down
48 changes: 48 additions & 0 deletions src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3679,4 +3679,52 @@
<data name="Argument_SpansMustHaveSameLength" xml:space="preserve">
<value>Length of items must be same as length of keys.</value>
</data>
<data name="NotSupported_CannotWriteToBufferedStreamIfReadBufferCannotBeFlushed" xml:space="preserve">
<value>Cannot write to a BufferedStream while the read buffer is not empty if the underlying stream is not seekable. Ensure that the stream underlying this BufferedStream can seek or avoid interleaving read and write operations on this BufferedStream.</value>
</data>
<data name="GenericInvalidData" xml:space="preserve">
<value>Found invalid data while decoding.</value>
</data>
<data name="Argument_ResourceScopeWrongDirection" xml:space="preserve">
<value>Resource type in the ResourceScope enum is going from a more restrictive resource type to a more general one. From: "{0}" To: "{1}"</value>
</data>
<data name="ArgumentNull_TypeRequiredByResourceScope" xml:space="preserve">
<value>The type parameter cannot be null when scoping the resource's visibility to Private or Assembly.</value>
</data>
<data name="Argument_BadResourceScopeTypeBits" xml:space="preserve">
<value>Unknown value for the ResourceScope: {0} Too many resource type bits may be set.</value>
</data>
<data name="Argument_BadResourceScopeVisibilityBits" xml:space="preserve">
<value>Unknown value for the ResourceScope: {0} Too many resource visibility bits may be set.</value>
</data>
<data name="net_emptystringcall" xml:space="preserve">
<value>The parameter '{0}' cannot be an empty string.</value>
</data>
<data name="Argument_EmptyApplicationName" xml:space="preserve">
<value>ApplicationId cannot have an empty string for the name.</value>
</data>
<data name="Argument_FrameworkNameInvalid" xml:space="preserve">
<value> FrameworkName is invalid.</value>
</data>
<data name="Argument_FrameworkNameInvalidVersion" xml:space="preserve">
<value>FrameworkName version component is invalid.</value>
</data>
<data name="Argument_FrameworkNameMissingVersion" xml:space="preserve">
<value>FrameworkName version component is missing.</value>
</data>
<data name="Argument_FrameworkNameTooShort" xml:space="preserve">
<value>FrameworkName cannot have less than two components or more than three components.</value>
</data>
<data name="Arg_SwitchExpressionException" xml:space="preserve">
<value>Non-exhaustive switch expression failed to match its input.</value>
</data>
<data name="Arg_ContextMarshalException" xml:space="preserve">
<value>Attempted to marshal an object across a context boundary.</value>
</data>
<data name="Arg_AppDomainUnloadedException" xml:space="preserve">
<value>Attempted to access an unloaded AppDomain.</value>
</data>
<data name="SwitchExpressionException_UnmatchedValue" xml:space="preserve">
<value>Unmatched value was {0}.</value>
</data>
</root>
Loading