Skip to content

Commit

Permalink
Revert removal of workaround
Browse files Browse the repository at this point in the history
Probably the change to not prune packages if there are no FrameworkReferences reverted this to the old behavior
  • Loading branch information
dsplaisted committed Jan 29, 2025
1 parent 10e515d commit d992386
Showing 1 changed file with 18 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ public void compose_dependencies()
"fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll"
};

if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store
files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}");
}

storeDirectory.Should().OnlyHaveFiles(files_on_disk);
}

Expand Down Expand Up @@ -108,6 +114,12 @@ public void compose_dependencies_noopt()
"fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll"
};

if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store
files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}");
}

storeDirectory.Should().OnlyHaveFiles(files_on_disk);
}

Expand Down Expand Up @@ -145,6 +157,12 @@ public void compose_multifile()
"fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll",
};

if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store
files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}");
}

storeDirectory.Should().OnlyHaveFiles(files_on_disk);

var knownpackage = new HashSet<PackageIdentity>
Expand Down

0 comments on commit d992386

Please sign in to comment.