Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
544fa8a
Update out-of-band generators to explicitly reference pinned versions…
jkoritzinsky Jan 15, 2022
1e4f98f
Update Roslyn and update the DllImportGenerator incremental generatio…
jkoritzinsky Jan 19, 2022
1f5ea02
Bump Roslyn to get the bugfix and finish updating the incremental gen…
jkoritzinsky Jan 21, 2022
cbe6dc2
Merge branch 'main' into update-roslyn
jkoritzinsky Jan 21, 2022
4e491b2
Merge branch 'main' of github.com:dotnet/runtime into update-roslyn
jkoritzinsky Feb 4, 2022
8cdb7d0
Escape per CS8981 throughout the repo.
jkoritzinsky Feb 4, 2022
c40fcb2
Fix build
jkoritzinsky Feb 7, 2022
0b06bd9
Import test_dependencies' nuget-generated props/targets since we don'…
jkoritzinsky Feb 9, 2022
bfc324a
Merge branch 'main' of github.com:dotnet/runtime into update-roslyn
jkoritzinsky Feb 9, 2022
cd57d2b
Unify roslyn version.
jkoritzinsky Feb 9, 2022
4a7b84d
Remove some extraneous escapes in comments
jkoritzinsky Feb 9, 2022
ea30f83
Fix build failures other than the binary/text issue.
jkoritzinsky Feb 10, 2022
979ca2f
Merge branch 'main' of github.com:dotnet/runtime into update-roslyn
jkoritzinsky Feb 18, 2022
1bb9514
Update compiler toolset to get dotnet/roslyn#59578
jkoritzinsky Feb 18, 2022
bfb3115
Update Roslyn version again to get latest fix.
jkoritzinsky Feb 23, 2022
100f65c
Merge branch 'main' into update-roslyn
jkoritzinsky Feb 24, 2022
b44c0ec
PR feedback and update Roslyn again now that Chris has actually put i…
jkoritzinsky Feb 28, 2022
cc60244
Disable capitalization warning in the src/tests tree
jkoritzinsky Mar 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
Prev Previous commit
Next Next commit
Escape per CS8981 throughout the repo.
  • Loading branch information
jkoritzinsky committed Feb 4, 2022
commit 8cdb7d0bc2aacf7c58d1c535e61529ded59ffedd
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,22 @@ internal struct gid_t
public uint id;
}
[StructLayout(LayoutKind.Sequential)]
public struct timeval
public struct @timeval
{
public IntPtr tv_sec;
public IntPtr tv_usec;
}

[StructLayout(LayoutKind.Sequential)]
private struct vnode
private struct @vnode
{
public long tv_sec;
public long tv_usec;
}

// sys/resource.h
[StructLayout(LayoutKind.Sequential)]
internal struct rusage
internal struct @rusage
{
public timeval ru_utime; /* user time used */
public timeval ru_stime; /* system time used */
Expand Down Expand Up @@ -164,9 +164,9 @@ public unsafe struct kinfo_proc
public int ki_numthreads; /* XXXKSE number of threads in total */
public int ki_tid; /* XXXKSE thread id */
private fixed byte ki_pri[4]; /* process priority */
public rusage ki_rusage; /* process rusage statistics */
public rusage ki_rusage; /* process @rusage statistics */
/* XXX - most fields in ki_rusage_ch are not (yet) filled in */
private rusage ki_rusage_ch; /* rusage of children processes */
private rusage ki_rusage_ch; /* @rusage of children processes */
private void* ki_pcb; /* kernel virtual addr of pcb */
private void* ki_kstack; /* kernel virtual addr of stack */
private void* ki_udata; /* User convenience pointer */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

internal static partial class Interop
{
internal static partial class procfs
internal static partial class @procfs
{
private const string MapsFileName = "/maps";

Expand Down
5 changes: 2 additions & 3 deletions src/libraries/Common/src/Interop/OSX/Interop.Libraries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ internal static partial class Libraries
internal const string CoreFoundationLibrary = "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
internal const string CoreServicesLibrary = "/System/Library/Frameworks/CoreServices.framework/CoreServices";
internal const string CFNetworkLibrary = "/System/Library/Frameworks/CFNetwork.framework/CFNetwork";
internal const string libobjc = "/usr/lib/libobjc.dylib";
internal const string libproc = "/usr/lib/libproc.dylib";
internal const string @libobjc = "/usr/lib/libobjc.dylib";
internal const string @libproc = "/usr/lib/libproc.dylib";
internal const string Odbc32 = "libodbc.2.dylib";
internal const string OpenLdap = "libldap.dylib";
internal const string SystemConfigurationLibrary = "/System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration";
internal const string AppleCryptoNative = "libSystem.Security.Cryptography.Native.Apple";
internal const string MsQuic = "libmsquic.dylib";
internal const string libc = "libc";
}
}
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/OSX/Interop.libc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

internal static partial class Interop
{
internal static partial class libc
internal static partial class @libc
{
[StructLayout(LayoutKind.Sequential)]
internal struct AttrList
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/OSX/Interop.libobjc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

internal static partial class Interop
{
internal static partial class libobjc
internal static partial class @libobjc
{
[StructLayout(LayoutKind.Sequential)]
private struct NSOperatingSystemVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

internal static partial class Interop
{
internal static partial class libproc
internal static partial class @libproc
{
// Constants from sys\param.h
private const int MAXCOMLEN = 16;
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/Common/src/Interop/OSX/Interop.libproc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

internal static partial class Interop
{
internal static partial class libproc
internal static partial class @libproc
{
// Constants from sys\param.h
private const int MAXPATHLEN = 1024;
Expand Down Expand Up @@ -350,9 +350,9 @@ internal static unsafe string proc_pidpath(int pid)
}

/// <summary>
/// Gets the rusage information for the process identified by the PID
/// Gets the @rusage information for the process identified by the PID
/// </summary>
/// <param name="pid">The process to retrieve the rusage for</param>
/// <param name="pid">The process to retrieve the @rusage for</param>
/// <param name="flavor">Specifies the type of struct that is passed in to <paramref>buffer</paramref>. Should be RUSAGE_INFO_V3 to specify a rusage_info_v3 struct.</param>
/// <param name="buffer">A buffer to be filled with rusage_info data</param>
/// <returns>Returns 0 on success; on fail, -1 and errno is set with the error code</returns>
Expand All @@ -363,9 +363,9 @@ private static unsafe partial int proc_pid_rusage(
rusage_info_v3* buffer);

/// <summary>
/// Gets the rusage information for the process identified by the PID
/// Gets the @rusage information for the process identified by the PID
/// </summary>
/// <param name="pid">The process to retrieve the rusage for</param>
/// <param name="pid">The process to retrieve the @rusage for</param>
/// <returns>On success, returns a struct containing info about the process; on
/// failure or when the caller doesn't have permissions to the process, throws a Win32Exception
/// </returns>
Expand All @@ -379,7 +379,7 @@ internal static unsafe rusage_info_v3 proc_pid_rusage(int pid)

rusage_info_v3 info = default;

// Get the PIDs rusage info
// Get the PIDs @rusage info
int result = proc_pid_rusage(pid, RUSAGE_INFO_V3, &info);
if (result < 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

internal static partial class Interop
{
internal static partial class procfs
internal static partial class @procfs
{
/// <summary>
/// Attempts to get status info for the specified process ID.
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/Unix/Interop.Libraries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ internal static partial class Interop
{
internal static partial class Libraries
{
internal const string Libc = "libc";
internal const string @libc = "libc";

// Shims
internal const string SystemNative = "libSystem.Native";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

internal static partial class Interop
{
internal static partial class libc
internal static partial class @libc
{
[GeneratedDllImport(Libraries.Libc, EntryPoint = "getppid")]
[GeneratedDllImport(Libraries.libc, EntryPoint = "getppid")]
internal static partial int GetParentPid();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static partial class PlatformDetection
public static bool IsNotFedoraOrRedHatFamily => !IsFedora && !IsRedHatFamily;
public static bool IsNotDebian10 => !IsDebian10;

public static bool IsSuperUser => IsBrowser || IsWindows ? false : Libc.geteuid() == 0;
public static bool IsSuperUser => IsBrowser || IsWindows ? false : libc.geteuid() == 0;

public static Version OpenSslVersion => !IsOSXLike && !IsWindows && !IsAndroid ?
GetOpenSslVersion() :
Expand All @@ -77,7 +77,7 @@ public static string LibcRelease

try
{
return Marshal.PtrToStringAnsi(Libc.gnu_get_libc_release());
return Marshal.PtrToStringAnsi(libc.gnu_get_libc_release());
}
catch (Exception e) when (e is DllNotFoundException || e is EntryPointNotFoundException)
{
Expand All @@ -101,7 +101,7 @@ public static string LibcVersion

try
{
return Marshal.PtrToStringAnsi(Libc.gnu_get_libc_version());
return Marshal.PtrToStringAnsi(libc.gnu_get_libc_version());
}
catch (Exception e) when (e is DllNotFoundException || e is EntryPointNotFoundException)
{
Expand Down Expand Up @@ -324,7 +324,7 @@ private struct DistroInfo
public Version VersionId { get; set; }
}

private static partial class Libc
private static partial class @libc
{
[GeneratedDllImport("libc", SetLastError = true)]
public static unsafe partial uint geteuid();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
<!-- CS8981: The type name 'libc' only contains lower-cased ascii characters. Such names may become reserved for the language. -->
<NoWarn>$(NoWarn);CS8981</NoWarn>
</PropertyGroup>

<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ private class Kernel32
public static extern int GetLastError();
}

private class Libc
private class @libc
{
[DllImport("libc")]
internal static unsafe extern int* __errno_location();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public unsafe struct ProcessEntry32W
public static extern bool Process32NextW(IntPtr snapshot, ref ProcessEntry32W entry);
}

static class libproc
static class @libproc
{
[DllImport(nameof(libproc))]
private static extern int proc_listchildpids(int ppid, int[] buffer, int byteSize);
Expand Down