From bc0e2887afa266a7828d13a4de113f2360ef8fe4 Mon Sep 17 00:00:00 2001 From: Jose Luis Chavez del Cid Date: Sun, 22 Dec 2019 16:41:41 -0600 Subject: [PATCH 1/2] Referenced Assembly Resolution Under certain circumstances referenced assemblies are not resolved by Mono Cecil for files under the same folder where the assembly is located, a resolver is set so that the folder is added to the search locations. --- NuPack/NuPack/Program.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NuPack/NuPack/Program.cs b/NuPack/NuPack/Program.cs index 1e1a575..58e0ab2 100644 --- a/NuPack/NuPack/Program.cs +++ b/NuPack/NuPack/Program.cs @@ -172,10 +172,13 @@ static private ZipPackage Template() static private void Create(string solution, string project, string configuration, string plateform, string assembly) { + var _directory = Path.GetDirectoryName(assembly); + var resolver = new DefaultAssemblyResolver(); + resolver.AddSearchDirectory(_directory, new ReaderParameters { AssemblyResolver = resolver }); + var _assembly = AssemblyDefinition.ReadAssembly(assembly); var _name = _assembly.Name.Name; var _version = _assembly.Metadata(); - var _directory = Path.GetDirectoryName(assembly); var _dependencies = new PackageReferenceFile(string.Concat(Path.GetDirectoryName(project), @"\packages.config")).GetPackageReferences().Where(_Package => _Package.Id != "NuPack").ToArray(); var _extension = _dependencies.Any(_Dependency => _Dependency.Id == "NuPack.Extension"); var _setting = new Setting(solution, project, configuration, plateform, assembly); From ea644d19db523b0e04286f928901faff2d74d317 Mon Sep 17 00:00:00 2001 From: Jose Luis Chavez del Cid Date: Sun, 22 Dec 2019 16:55:49 -0600 Subject: [PATCH 2/2] Update Version for Release Updating minor version number, for deploying to the nuget repository. --- NuPack/NuPack/Properties/AssemblyInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuPack/NuPack/Properties/AssemblyInfo.cs b/NuPack/NuPack/Properties/AssemblyInfo.cs index c5bf094..d57bbe6 100644 --- a/NuPack/NuPack/Properties/AssemblyInfo.cs +++ b/NuPack/NuPack/Properties/AssemblyInfo.cs @@ -12,10 +12,10 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("85c23e55-ec01-4202-8bf6-4c708374359b")] -[assembly: AssemblyVersion("3.4.4")] -[assembly: AssemblyFileVersion("3.4.4")] +[assembly: AssemblyVersion("3.4.5")] +[assembly: AssemblyFileVersion("3.4.5")] #if DEBUG [assembly: AssemblyConfiguration("Debug")] #else [assembly: AssemblyConfiguration("Release")] -#endif \ No newline at end of file +#endif