Skip to content

Fix invalid reference when using DevPacks inside DevPacks with different versions #142

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
MichielOda merged 1 commit into from
Mar 9, 2026
Merged

Fix invalid reference when using DevPacks inside DevPacks with different versions #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Assemblers.Common/PackageReferenceProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ private async Task ProcessResolvedPackagesAsync(IEnumerable<PackageIdentity> res

nugetPackageAssemblies.ProcessedAssemblies.Add(assemblyName);

if (!resolvedPackage.Id.StartsWith(DevPackHelper.FilesPrefix))
if (!resolvedPackage.Id.StartsWith(DevPackHelper.FilesPrefix) && !NuGetHelper.IsSolutionLibraryNuGetPackage(resolvedPackage.Id, out _))
{
nugetPackageAssemblies.ImplicitDllImportDirectoryReferences.Add(dllImportDirectory);
}
Expand Down Expand Up @@ -456,7 +456,7 @@ private async Task ProcessRemainingPackagesAsync(HashSet<SourcePackageDependency
string dllImportDirectory = packageKey + "\\" + _fileSystem.Path.GetDirectoryName(firstFilteredLibItem).Replace("/", "\\");

// Add the directory to be added to the dllImport attribute so the assembly can be found at runtime.
if (!nugetPackageAssemblies.ImplicitDllImportDirectoryReferences.Contains(dllImportDirectory))
if (!nugetPackageAssemblies.ImplicitDllImportDirectoryReferences.Contains(dllImportDirectory) && !NuGetHelper.IsSolutionLibraryNuGetPackage(packageToInstall.Id, out _))
{
nugetPackageAssemblies.DllImportDirectoryReferences.Add(dllImportDirectory + "\\");

Expand Down
23 changes: 3 additions & 20 deletions Assemblers.CommonTests/PackageReferenceProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,13 @@ public async Task ProcessAsyncTest_SolutionLibraries()

const string pathJson = "newtonsoft.json\\13.0.3\\lib\\net45";
const string pathExportImport = "skyline.dataminer.utils.exportimport\\1.0.0\\lib\\netstandard2.0";
const string pathSolutionLib = "skyline.dataminer.dev.utils.modsolutionlib\\1.0.0\\lib\\netstandard2.0";

var expectedResult = new NuGetPackageAssemblyData
{
ImplicitDllImportDirectoryReferences =
{
pathJson,
pathExportImport,
pathSolutionLib,
},
DllImportNugetAssemblyReferences =
{
Expand Down Expand Up @@ -451,7 +450,7 @@ public async Task ProcessAsyncTest_SolutionLibraries2()
const string targetFrameworkMoniker = ".NETFramework,Version=v4.8";

/*
*<Param type="ref">C:\Skyline DataMiner\ProtocolScripts\DllImport\alphafs.new\2.3.0\lib\net47\AlphaFS.dll</Param>
<Param type="ref">C:\Skyline DataMiner\ProtocolScripts\DllImport\alphafs.new\2.3.0\lib\net47\AlphaFS.dll</Param>
<Param type="ref">C:\Skyline DataMiner\ProtocolScripts\DllImport\newtonsoft.json\13.0.3\lib\net45\Newtonsoft.Json.dll</Param>
<Param type="ref">C:\Skyline DataMiner\ProtocolScripts\DllImport\sharpziplib\1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</Param>
<Param type="ref">C:\Skyline DataMiner\ProtocolScripts\DllImport\skyline.dataminer.cicd.filesystem\1.1.0\lib\netstandard2.0\Skyline.DataMiner.CICD.FileSystem.dll</Param>
Expand Down Expand Up @@ -486,8 +485,6 @@ public async Task ProcessAsyncTest_SolutionLibraries2()
<Param type="ref">C:\Skyline DataMiner\ProtocolScripts\DllImport\skyline.dataminer.connectorapi.skylinelockmanager\1.3.4\lib\net462\Skyline.DataMiner.ConnectorAPI.SkylineLockManager.dll</Param>
<Param type="ref">C:\Skyline DataMiner\ProtocolScripts\DllImport\SolutionLibraries\Solutions.MediaOps.Live\Skyline.DataMiner.Dev.Utils.Solutions.MediaOps.Live.dll</Param>
<Param type="ref">C:\Skyline DataMiner\ProtocolScripts\DllImport\SolutionLibraries\Solutions.MediaOps.Plan\Skyline.DataMiner.Dev.Utils.Solutions.MediaOps.Plan.dll</Param>

*
*/

const string pathAlphaFs = "alphafs.new\\2.3.0\\lib\\net47";
Expand Down Expand Up @@ -522,11 +519,6 @@ public async Task ProcessAsyncTest_SolutionLibraries2()
const string pathCoreInterapp = "skyline.dataminer.core.interappcalls.common\\1.1.1.1\\lib\\net462";
const string pathConnectorApiLock = "skyline.dataminer.connectorapi.skylinelockmanager\\1.3.4\\lib\\net462";

const string pathSolLibSdmAbstractions = "skyline.dataminer.dev.utils.sdm.abstractions\\1.0.1\\lib\\net48";
const string pathSolLibCategories = "skyline.dataminer.dev.utils.solutions.categories\\1.1.0\\lib\\net48";
const string pathSolLibMediaOpsLive = "skyline.dataminer.dev.utils.solutions.mediaops.live\\1.0.0\\lib\\net48";
const string pathSolLibMediaOpsPlan = "skyline.dataminer.dev.utils.solutions.mediaops.plan\\1.5.0\\lib\\net48";

const string scriptPathSolLibSdmAbstractions = "SolutionLibraries\\SDM.Abstractions\\Skyline.DataMiner.Dev.Utils.SDM.Abstractions.dll";
const string scriptPathSolLibCategories = "SolutionLibraries\\Solutions.Categories\\Skyline.DataMiner.Dev.Utils.Solutions.Categories.dll";
const string scriptPathSolLibMediaOpsLive = "SolutionLibraries\\Solutions.MediaOps.Live\\Skyline.DataMiner.Dev.Utils.Solutions.MediaOps.Live.dll";
Expand Down Expand Up @@ -567,11 +559,6 @@ public async Task ProcessAsyncTest_SolutionLibraries2()
pathSecureCoding,
pathCoreInterapp,
pathConnectorApiLock,

pathSolLibSdmAbstractions,
pathSolLibCategories,
pathSolLibMediaOpsLive,
pathSolLibMediaOpsPlan
},
DllImportNugetAssemblyReferences =
{
Expand Down Expand Up @@ -689,7 +676,7 @@ public async Task ProcessAsyncTest_SolutionLibraries2()
"Skyline.DataMiner.Utils.SecureCoding.dll",
"Skyline.DataMiner.Core.InterAppCalls.Common.dll",
"Skyline.DataMiner.ConnectorAPI.SkylineLockManager.dll",

"Skyline.DataMiner.Dev.Utils.SDM.Abstractions.dll",
"Skyline.DataMiner.Dev.Utils.Solutions.Categories.dll",
"Skyline.DataMiner.Dev.Utils.Solutions.MediaOps.Live.dll",
Expand All @@ -709,8 +696,6 @@ public async Task ProcessAsyncTest_SolutionLibraries2()
["system.runtime.compilerservices.unsafe\\4.5.3\\lib\\net461\\"] = "system.runtime.compilerservices.unsafe\\4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll",
["skyline.dataminer.core.dataminersystem.common\\1.1.3.5\\lib\\net462\\"] = "skyline.dataminer.core.dataminersystem.common\\1.1.3.5\\lib\\net462\\Skyline.DataMiner.Core.DataMinerSystem.Common.dll",
["skyline.dataminer.core.dataminersystem.common\\1.1.3.3\\lib\\net462\\"] = "skyline.dataminer.core.dataminersystem.common\\1.1.3.3\\lib\\net462\\Skyline.DataMiner.Core.DataMinerSystem.Common.dll",

["skyline.dataminer.dev.utils.solutions.mediaops.live\\0.0.0\\lib\\net48\\"] = "skyline.dataminer.dev.utils.solutions.mediaops.live\\0.0.0\\lib\\net48\\Skyline.DataMiner.Dev.Utils.Solutions.MediaOps.Live.dll",
},
DllImportDirectoryReferences =
{
Expand All @@ -719,8 +704,6 @@ public async Task ProcessAsyncTest_SolutionLibraries2()
"system.runtime.compilerservices.unsafe\\4.5.3\\lib\\net461\\",
"skyline.dataminer.core.dataminersystem.common\\1.1.3.5\\lib\\net462\\",
"skyline.dataminer.core.dataminersystem.common\\1.1.3.3\\lib\\net462\\",

"skyline.dataminer.dev.utils.solutions.mediaops.live\\0.0.0\\lib\\net48\\"
},
DllImportFrameworkAssemblyReferences =
{
Expand Down