Skip to content

Commit 0e387d7

Browse files
authored
Fixing core tools host (#4417)
1 parent 77ce768 commit 0e387d7

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

eng/ci/build-core-tools-host-artifacts-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trigger:
66
- main
77
paths:
88
include:
9-
- /host/src/**
9+
- /src/CoreToolsHost/**
1010

1111
resources:
1212
repositories:

eng/ci/consolidate-artifacts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ resources:
2525
pipelines:
2626
- pipeline: core-tools-host
2727
source: azure/azure-functions-core-tools/core-tools-host.official
28+
branch: main
2829

2930
- pipeline: core-tools-inproc
3031
source: azure/azure-functions-core-tools/core-tools.official

src/CoreToolsHost/AppLoader/NetHost.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace CoreToolsHost
77
{
88
internal class NetHost
99
{
10-
[DllImport("nethost", CharSet = CharSet.Auto)]
10+
[DllImport("nethost", EntryPoint = "get_hostfxr_path", CharSet = CharSet.Auto)]
1111
private static extern unsafe int GetHostFXRPath(
1212
[Out] char[] buffer,
1313
[In] ref int buffer_size,

src/CoreToolsHost/Environment/EnvironmentUtils.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal static class EnvironmentUtils
77
{
88
#if OS_LINUX
99
[System.Runtime.InteropServices.DllImport("libc")]
10-
private static extern int setenv(string name, string value, int overwrite);
10+
private static extern int SetEnv(string name, string value, int overwrite);
1111
#endif
1212

1313
/// <summary>
@@ -28,7 +28,7 @@ internal static void SetValue(string name, string value)
2828
* So using the native method directly here.
2929
* */
3030
#if OS_LINUX
31-
setenv(name, value, 1);
31+
SetEnv(name, value, 1);
3232
#else
3333
Environment.SetEnvironmentVariable(name, value);
3434
#endif

0 commit comments

Comments
 (0)