Skip to content

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #84610

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
carlossanlop merged 19 commits into from
Apr 19, 2023
Merged

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #84610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
82db9f0
Merge in 'release/6.0' changes
dotnet-bot Mar 8, 2023
187b2c3
Merge in 'release/6.0' changes
dotnet-bot Mar 8, 2023
b4bbd4b
Merge in 'release/6.0' changes
dotnet-bot Mar 8, 2023
cda0970
Merge in 'release/6.0' changes
dotnet-bot Mar 9, 2023
6137b3c
Merge in 'release/6.0' changes
dotnet-bot Mar 9, 2023
1e7b01d
Merge in 'release/6.0' changes
dotnet-bot Mar 9, 2023
964350a
Merge in 'release/6.0' changes
dotnet-bot Mar 10, 2023
b4ba75b
Merged PR 29288: [internal/release/6.0] Fix handling of load for msqu…
elinor-fung Mar 10, 2023
b30ff25
Merge in 'release/6.0' changes
dotnet-bot Mar 14, 2023
5cfe3b4
Merge in 'release/6.0' changes
dotnet-bot Mar 16, 2023
90ad458
Merge in 'release/6.0' changes
dotnet-bot Mar 17, 2023
567ff53
Merge in 'release/6.0' changes
dotnet-bot Mar 20, 2023
1e620a4
Merge in 'release/6.0' changes
dotnet-bot Mar 23, 2023
300ceb8
Merge pull request #84593 from carlossanlop/release/6.0-staging
carlossanlop Apr 11, 2023
f40a2d9
Merge commit '1e620a42e71ca8c7efb033fd525f04be5fa701fe' into internal…
vseanreesermsft Apr 11, 2023
fcd2831
Merge pull request #84639 from vseanreesermsft/internal-merge-6.0-202…
carlossanlop Apr 11, 2023
066cc87
[release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk (#8…
dotnet-maestro[bot] Apr 12, 2023
51e6047
[release/6.0] Fix null being passed to g_path_get_dirname when probin…
github-actions[bot] Apr 12, 2023
75ce69d
[release/6.0] Move mono.mscordbi subset off the offical build (#84939)
steveisok Apr 17, 2023
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
2 changes: 1 addition & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-3c730c2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3c730c2c/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-275d1fa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-275d1fa1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
Expand Down
82 changes: 41 additions & 41 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,93 +10,93 @@
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.17">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>3c730c2c99c521adabe9b67b74bdba3a682d66d7</Sha>
<Sha>275d1fa1fa5df44c2189d3976a351ed001e6f7b4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.17">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>3c730c2c99c521adabe9b67b74bdba3a682d66d7</Sha>
<Sha>275d1fa1fa5df44c2189d3976a351ed001e6f7b4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.17">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>3c730c2c99c521adabe9b67b74bdba3a682d66d7</Sha>
<Sha>275d1fa1fa5df44c2189d3976a351ed001e6f7b4</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
<Uri>https://github.com/dotnet/wcf</Uri>
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23167.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -222,9 +222,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23167.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23167.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23167.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23167.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23167.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23167.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23167.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23167.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23167.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23167.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23167.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23167.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23167.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23167.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23167.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23211.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23211.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23211.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23211.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23211.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23211.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23211.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23211.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23211.7</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ stages:
# - windows_arm
# - windows_arm64
jobParameters:
buildArgs: -s mono+libs+host+packs+mono.mscordbi -c $(_BuildConfig)
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
nameSuffix: AllSubsets_Mono
isOfficialBuild: ${{ variables.isOfficialBuild }}
extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ jobs:
jobParameters:
testScope: innerloop
nameSuffix: AllSubsets_Mono
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
buildArgs: -s mono+mono.mscordbi+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
timeoutInMinutes: 120
condition: >-
or(
Expand Down
12 changes: 6 additions & 6 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"sdk": {
"version": "6.0.115",
"version": "6.0.116",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.115"
"dotnet": "6.0.116"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23167.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23167.1",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23167.1",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23211.7",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23211.7",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23211.7",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"
Expand Down
4 changes: 3 additions & 1 deletion ...ibraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ static MsQuicApi()
return;
}

if (!NativeLibrary.TryLoad(Interop.Libraries.MsQuic, typeof(MsQuicApi).Assembly, DllImportSearchPath.AssemblyDirectory, out IntPtr msQuicHandle))
// Windows ships msquic in the assembly directory. Non-Windows relies an the package being installed on the system.
DllImportSearchPath? searchPath = OperatingSystem.IsWindows() ? DllImportSearchPath.AssemblyDirectory : null;
if (!NativeLibrary.TryLoad(Interop.Libraries.MsQuic, typeof(MsQuicApi).Assembly, searchPath, out IntPtr msQuicHandle))
{
// MsQuic library not loaded
return;
Expand Down
28 changes: 20 additions & 8 deletions src/mono/mono/metadata/native-library.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ mono_dllmap_lookup_list (MonoDllMap *dll_map, const char *dll, const char* func,
if (!dll_map)
goto exit;

/*
/*
* we use the first entry we find that matches, since entries from
* the config file are prepended to the list and we document that the
* later entries win.
Expand Down Expand Up @@ -254,7 +254,7 @@ mono_global_dllmap_cleanup (void)
* This function is used to programatically add \c DllImport remapping in either
* a specific assembly, or as a global remapping. This is done by remapping
* references in a \c DllImport attribute from the \p dll library name into the \p tdll
* name. If the \p dll name contains the prefix <code>i:</code>, the comparison of the
* name. If the \p dll name contains the prefix <code>i:</code>, the comparison of the
* library name is done without case sensitivity.
*
* If you pass \p func, this is the name of the \c EntryPoint in a \c DllImport if specified
Expand Down Expand Up @@ -518,21 +518,33 @@ netcore_probe_for_module (MonoImage *image, const char *file_name, int flags)
// TODO: this algorithm doesn't quite match CoreCLR, so respecting DLLIMPORTSEARCHPATH_LEGACY_BEHAVIOR makes little sense
// If the difference becomes a problem, overhaul this algorithm to match theirs exactly

// Try without any path additions
#if defined(HOST_ANDROID)
// On Android, try without any path additions first. It is sensitive to probing that will always miss
// and lookup for some libraries is required to use a relative path
module = netcore_probe_for_module_variations (NULL, file_name, lflags);
#endif

// Check the NATIVE_DLL_SEARCH_DIRECTORIES
for (int i = 0; i < pinvoke_search_directories_count && module == NULL; ++i)
module = netcore_probe_for_module_variations (pinvoke_search_directories[i], file_name, lflags);

// Check the assembly directory if the search flag is set and the image exists
if (flags & DLLIMPORTSEARCHPATH_ASSEMBLY_DIRECTORY && image != NULL && module == NULL) {
if ((flags & DLLIMPORTSEARCHPATH_ASSEMBLY_DIRECTORY) != 0 && image != NULL &&
module == NULL && (image->filename != NULL)) {
char *mdirname = g_path_get_dirname (image->filename);
if (mdirname)
module = netcore_probe_for_module_variations (mdirname, file_name, lflags);
g_free (mdirname);
}

#if !defined(HOST_ANDROID)
// Try without any path additions
if (module == NULL)
{
module = netcore_probe_for_module_variations (NULL, file_name, lflags);
}
#endif

// TODO: Pass remaining flags on to LoadLibraryEx on Windows where appropriate, see https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.dllimportsearchpath?view=netcore-3.1

return module;
Expand Down Expand Up @@ -1048,7 +1060,7 @@ lookup_pinvoke_call_impl (MonoMethod *method, MonoLookupPInvokeStatus *status_ou
mono_custom_attrs_free (cinfo);
}
if (flags < 0)
flags = 0;
flags = DLLIMPORTSEARCHPATH_ASSEMBLY_DIRECTORY;
module = netcore_lookup_native_library (alc, image, new_scope, flags);

if (!module) {
Expand Down Expand Up @@ -1154,7 +1166,7 @@ pinvoke_probe_for_symbol (MonoDl *module, MonoMethodPInvoke *piinfo, const char

#if HOST_WIN32 && HOST_X86
/* Try the stdcall mangled name */
/*
/*
* gcc under windows creates mangled names without the underscore, but MS.NET
* doesn't support it, so we doesn't support it either.
*/
Expand Down Expand Up @@ -1394,7 +1406,7 @@ mono_loader_save_bundled_library (int fd, uint64_t offset, uint64_t size, const
char *file, *buffer, *err, *internal_path;
if (!bundle_save_library_initialized)
bundle_save_library_initialize ();

file = g_build_filename (bundled_dylibrary_directory, destfname, (const char*)NULL);
buffer = g_str_from_file_region (fd, offset, size);
g_file_set_contents (file, buffer, size, NULL);
Expand All @@ -1409,7 +1421,7 @@ mono_loader_save_bundled_library (int fd, uint64_t offset, uint64_t size, const
mono_loader_register_module (internal_path, lib);
g_free (internal_path);
bundle_library_paths = g_slist_append (bundle_library_paths, file);

g_free (buffer);
}

Expand Down
3 changes: 3 additions & 0 deletions src/tests/Common/CoreCLRTestLibrary/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ public static bool Verbose
public static bool IsWindows7 => IsWindows && Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor == 1;
public static bool IsWindowsNanoServer => (!IsWindowsIoTCore && GetInstallationType().Equals("Nano Server", StringComparison.OrdinalIgnoreCase));

private static string _variant = Environment.GetEnvironmentVariable("DOTNET_RUNTIME_VARIANT");
public static bool IsMonoLLVMFULLAOT => _variant == "llvmfullaot";

// Windows 10 October 2018 Update
public static bool IsWindows10Version1809OrGreater =>
IsWindows && GetWindowsVersion() == 10 && GetWindowsMinorVersion() == 0 && GetWindowsBuildNumber() >= 17763;
Expand Down
Loading