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.

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

Rename corefx -> runtime libraries #105285

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docs/workflow/testing/mono/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ $(REPO_ROOT)/dotnet.sh build /t:Test /p:RuntimeFlavor=mono /p:Configuration=<Rel
```
Alternatively, you could execute the following command from `$(REPO_ROOT)/src/mono`
```
make run-tests-corefx-<library>
make run-tests-libs-<library>
```
For example, the following command is for running System.Runtime tests:
```
make run-tests-corefx-System.Runtime
make run-tests-libs-System.Runtime
```

### Debugging libraries tests on Desktop Mono
Expand Down
12 changes: 6 additions & 6 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:8.0

FROM $BUILD_BASE_IMAGE as corefxbuild
FROM $BUILD_BASE_IMAGE as libsbuild

ARG CONFIGURATION=Release

Expand All @@ -28,23 +28,23 @@ RUN bash ./dotnet-install.sh --channel $_DOTNET_INSTALL_CHANNEL --quality daily
# 4. testhost
# 5. msquic interop sources (needed for HttpStress)

COPY --from=corefxbuild \
COPY --from=libsbuild \
/repo/artifacts/bin/microsoft.netcore.app.ref \
/live-runtime-artifacts/microsoft.netcore.app.ref

COPY --from=corefxbuild \
COPY --from=libsbuild \
/repo/artifacts/bin/microsoft.netcore.app.runtime.linux-x64 \
/live-runtime-artifacts/microsoft.netcore.app.runtime.linux-x64

COPY --from=corefxbuild \
COPY --from=libsbuild \
/repo/eng/targetingpacks.targets \
/live-runtime-artifacts/targetingpacks.targets

COPY --from=corefxbuild \
COPY --from=libsbuild \
/repo/artifacts/bin/testhost \
/live-runtime-artifacts/testhost

COPY --from=corefxbuild \
COPY --from=libsbuild \
/repo/src/libraries/System.Net.Quic/src/System/Net/Quic/Interop \
/live-runtime-artifacts/msquic-interop

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/fgehopt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ PhaseStatus Compiler::fgCloneFinally()
continue;
}

// Empirical studies from CoreCLR and CoreFX show that less
// Empirical studies from runtime repo show that less
// that 1% of finally regions have more than 15
// statements. So, to avoid potentially excessive code growth,
// only clone finallys that have 15 or fewer statements.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ namespace System.Runtime.CompilerServices
{
//
// Subsetted clone of System.Runtime.CompilerServices.Unsafe for internal runtime use.
// Keep in sync with https://github.com/dotnet/corefx/tree/master/src/System.Runtime.CompilerServices.Unsafe.
//

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/pal/src/init/pal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ PAL_SetInitializeDLLFlags(
pthread_attr_getstack is about 128kB, but this limit is not fixed and
the stack can grow dynamically. The problem is that it makes the
functions ReflectionInvocation::[Try]EnsureSufficientExecutionStack
to fail for real life scenarios like e.g. compilation of corefx.
to fail for real life scenarios like e.g. compilation of runtime libraries.
Since there is no real fixed limit for the stack, the code below
ensures moving the stack limit to a value that makes reasonable
real life scenarios work.
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tools/r2rtest/BuildOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public string CoreRootOutputPath(CompilerIndex index, bool isFramework)
/// <summary>
/// Creates compiler runner instances for each supported compiler based on the populated BuildOptions.
/// </summary>
/// <param name="isFramework">True if compiling the CoreFX framework assemblies</param>
/// <param name="isFramework">True if compiling the runtime libraries assemblies</param>
Copy link
Member

Choose a reason for hiding this comment

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

We've typically used "core libraries" (analogous to corelib which is just one). I've not heard "runtime libraries ". I edited the glossary too Core libraries

Copy link
Member Author

Choose a reason for hiding this comment

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

/// <param name="referencePaths">Optional set of reference paths to use instead of BuildOptions.ReferencePaths()</param>
public IEnumerable<CompilerRunner> CompilerRunners(bool isFramework, IEnumerable<string> overrideReferencePaths = null, string overrideOutputPath = null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ System.Diagnostics.DiagnosticSource</PackageDescription>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' or
'$(TargetFramework)' == 'netstandard2.0'">
<Compile Include="System\Diagnostics\Activity.DateTime.corefx.cs" />
<Compile Include="System\Diagnostics\Activity.DateTime.netcore.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# The .NET Foundation licenses this file to you under the MIT license.

# Helper script used for pointing the current powershell environment
# to the testhost sdk built by the corefx build script.
# to the testhost sdk built by the netcore build script.

[CmdletBinding(PositionalBinding=$false)]
Param(
Expand All @@ -21,7 +21,7 @@ if ($MyInvocation.InvocationName -ne ".")
exit
}

# find corefx root, assuming script lives in the git repo
# find netcore root, assuming script lives in the git repo
$SOURCE_DIR="$(split-path -Parent $MyInvocation.MyCommand.Definition)"
$DOTNET_TEST_ROOT_DIR=$(git -C "$SOURCE_DIR" rev-parse --show-toplevel)

Expand Down
4 changes: 2 additions & 2 deletions src/mono/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ run-tests-coreclr-all:
$(DOTNET) msbuild /t:RunCoreClrTests $(MONO_PROJ)

# run tests for a bcl lib, e.g.:
# make run-tests-corefx-System.Runtime
# make run-tests-libs-System.Runtime
# for `System.Runtime.Tests` (the rule builds both the lib and the test if needed)
run-tests-corefx-%:
run-tests-libs-%:
$(DOTNET) build ../../src/libraries/$*/tests -c $(LIBRARIES_TESTS_CONFIG) /p:RuntimeFlavor=mono /t:Test

2 changes: 1 addition & 1 deletion src/mono/mono/metadata/debug-mono-ppdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ mono_get_pe_debug_info_full (MonoImage *image, guint8 *out_guid, gint32 *out_age
}
if (debug_dir.type == DEBUG_DIR_ENTRY_PPDB && debug_dir.major_version >= 0x100 && debug_dir.minor_version == 0x100) {
/* Embedded PPDB blob */
/* See src/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.EmbeddedPortablePdb.cs in corefx */
/* See src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.EmbeddedPortablePdb.cs */
data = (guint8*)(image->raw_data + debug_dir.pointer);
guint32 magic = read32 (data);
g_assert (magic == EMBEDDED_PPDB_MAGIC);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/mini-runtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -4568,7 +4568,7 @@ mini_llvm_init (void)
pthread_attr_getstack is about 128kB, but this limit is not fixed and
the stack can grow dynamically. The problem is that it makes the
functions ReflectionInvocation::[Try]EnsureSufficientExecutionStack
to fail for real life scenarios like e.g. compilation of corefx.
to fail for real life scenarios like e.g. compilation of runtime libraries.
Since there is no real fixed limit for the stack, the code below
ensures moving the stack limit to a value that makes reasonable
real life scenarios work.
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/utils/mono-compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ typedef ptrdiff_t ssize_t;
/* Used to mark internal functions used by the profiler modules */
#define MONO_PROFILER_API MONO_API

/* Used to mark internal functions used by the CoreFX PAL library */
/* Used to mark internal functions used by the src/native/libs */
#define MONO_PAL_API MONO_API

/* Mono components */
Expand Down
2 changes: 1 addition & 1 deletion src/native/libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)

include(CheckCCompilerFlag)

project(CoreFX C)
project(RuntimeLibraries C)

include(../../../eng/native/configurepaths.cmake)
include(${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake)
Expand Down
4 changes: 2 additions & 2 deletions src/native/libs/System.Native/pal_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ enum
* Constants for interpreting the flags passed to Open or ShmOpen.
* There are several other values defined by POSIX but not implemented
* everywhere. The set below is restricted to the current needs of
* COREFX, which increases portability and speeds up conversion. We
* can add more as needed.
* runtime libraries, which increases portability and speeds up
* conversion. We can add more as needed.
*/
enum
{
Expand Down
2 changes: 1 addition & 1 deletion src/native/libs/build-native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,5 @@ setup_dirs
# Check prereqs.
check_prereqs

# Build the corefx native components.
# Build the libraries native components.
build_native "$__TargetOS" "$__TargetArch" "$__nativeroot" "$__IntermediatesDir" "install" "$__CMakeArgs" "native libraries component"
4 changes: 2 additions & 2 deletions src/native/libs/configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -583,11 +583,11 @@ else()

int main(void)
{
int fd = shm_open(\"/corefx_configure_shm_open\", O_CREAT | O_RDWR, 0777);
int fd = shm_open(\"/dotnet_configure_shm_open\", O_CREAT | O_RDWR, 0777);
if (fd == -1)
return -1;

shm_unlink(\"/corefx_configure_shm_open\");
shm_unlink(\"/dotnet_configure_shm_open\");

// NOTE: PROT_EXEC and MAP_PRIVATE don't work well with shm_open
// on at least the current version of Mac OS X
Expand Down
Loading
Loading