Skip to content

Added methods to skip cleaning of output assemblies to ExtensionsMetadataGenerator. #6849

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
merged 1 commit into from
Nov 13, 2020
Merged

Added methods to skip cleaning of output assemblies to ExtensionsMetadataGenerator. #6849

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
13 changes: 11 additions & 2 deletions ...MetadataGenerator/src/ExtensionsMetadataGenerator/BuildTasks/RemoveRuntimeDependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,17 @@ public class RemoveRuntimeDependencies : Task
[Required]
public string OutputPath { get; set; }

[Required]
public ITaskItem[] IgnoreFiles { get; set; }

public override bool Execute()
{
HashSet<string> ignoreFilesSet = new HashSet<string>();
foreach (ITaskItem item in IgnoreFiles)
{
ignoreFilesSet.Add(item.ItemSpec);
}

Assembly assembly = typeof(RemoveRuntimeDependencies).Assembly;
using (Stream resource = assembly.GetManifestResourceStream(assembly.GetName().Name + ".runtimeassemblies.txt"))
using (var reader = new StreamReader(resource))
Expand All @@ -32,7 +41,7 @@ public override bool Execute()
{
string fileName = Path.Combine(OutputPath, assemblyName);

if (File.Exists(fileName))
if (File.Exists(fileName) && !ignoreFilesSet.Contains(assemblyName))
{
File.Delete(fileName);
}
Expand All @@ -44,4 +53,4 @@ public override bool Execute()
return true;
}
}
}
}
4 changes: 2 additions & 2 deletions ...adataGenerator/Targets/Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
AssemblyFile="$(_FunctionsExtensionsTaskAssemblyFullPath)"/>

<Target Name="_FunctionsBuildCleanOutput" AfterTargets="_GenerateFunctionsExtensionsMetadataPostBuild" Condition="$(_FunctionsSkipCleanOutput) != 'true'" >
<RemoveRuntimeDependencies OutputPath="$(TargetDir)bin"/>
<RemoveRuntimeDependencies OutputPath="$(TargetDir)bin" IgnoreFiles="@(FunctionsPreservedDependencies)"/>
</Target>

<Target Name="_FunctionsPublishCleanOutput" AfterTargets="_GenerateFunctionsExtensionsMetadataPostPublish" Condition="$(_FunctionsSkipCleanOutput) != 'true'" >
<RemoveRuntimeDependencies OutputPath="$(PublishDir)bin"/>
<RemoveRuntimeDependencies OutputPath="$(PublishDir)bin" IgnoreFiles="@(FunctionsPreservedDependencies)"/>
</Target>

<UsingTask TaskName="GenerateFunctionsExtensionsMetadata"
Expand Down