This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,8 @@ private static void FormatEventTimeStat(StringBuilder builder, PerfTraceEvent e,
AppendTime(builder, e.Duration.TotalSeconds / root.Duration.TotalSeconds, 0.2);
}
AppendTime(builder, e.Duration.TotalSeconds / parent?.Duration.TotalSeconds, 0.5);
builder.Append($"{e.Duration.ToString("ss\\.fff\\s").Blue()}]");
builder.Append($"{(int)e.Duration.TotalSeconds}.{e.Duration.Milliseconds:000}s".Blue());
builder.Append("]");
}

private static void AppendTime(StringBuilder builder, double? percent, double treshold)
Expand Down
128 changes: 90 additions & 38 deletions src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class LibraryExporter
private readonly string _buildBasePath;
private readonly string _solutionRootPath;

private List<LibraryExport> _cachedExports;

public LibraryExporter(ProjectDescription rootProject,
LibraryManager manager,
string configuration,
Expand DownExpand Up@@ -84,62 +86,112 @@ public IEnumerable<LibraryExport> GetDependencies(LibraryType type)
/// </summary>
private IEnumerable<LibraryExport> ExportLibraries(Func<LibraryDescription, bool> condition)
{
var seenMetadataReferences = new HashSet<string>();
// Project Exports cannot be cached because the binding redirect file
// for desktop apps is not added to runtimeassets of the project
// until after the project is built.
var cache = GetCacheWithRefreshedProjectExports();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
foreach (var export in cache)
{
if (!condition(library))
if (!condition(export.Library))
{
continue;
}
yield return export;
}
}

var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);
private IEnumerable<LibraryExport> GetCacheWithRefreshedProjectExports()
{
if (_cachedExports == null)
{
_cachedExports = CalculateAllExports().ToList();
}

var seenMetadataReferences = new HashSet<string>();
var refreshedCache = new LibraryExport[_cachedExports.Count()];

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
int index = 0;
foreach (var export in _cachedExports)
{
if (Equals(export.Library.Identity.Type, LibraryType.Project))
{
if (seenMetadataReferences.Add(reference.Name))
{
compilationAssemblies.Add(reference);
}
refreshedCache[index++] = GenerateExportFromLibrary(seenMetadataReferences, export.Library);
}

// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
else
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
refreshedCache[index++] = export;
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
foreach (var reference in export.CompilationAssemblies)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
seenMetadataReferences.Add(reference.Name);
}
else
}

return refreshedCache;
}

private IEnumerable<LibraryExport> CalculateAllExports()
{
var seenMetadataReferences = new HashSet<string>();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
{
yield return GenerateExportFromLibrary(seenMetadataReferences, library);
}
}

private LibraryExport GenerateExportFromLibrary(
HashSet<string> seenMetadataReferences,
LibraryDescription library)
{
var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
{
if (seenMetadataReferences.Add(reference.Name))
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
compilationAssemblies.Add(reference);
}
}

yield return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
}
else
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
}

return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
}

private IEnumerable<LibraryAssetGroup> TrimAssetGroups(IEnumerable<LibraryAssetGroup> runtimeAssemblyGroups,
Expand Down
56 changes: 51 additions & 5 deletions src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,15 @@
using Microsoft.DotNet.ProjectModel.FileSystemGlobbing;
using Newtonsoft.Json.Linq;

using FourStringTuple = System.Tuple<string, string, string, string>;

namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{
private static readonly Dictionary<FourStringTuple, IEnumerable<string>> s_resolvedFilesCache =
new Dictionary<FourStringTuple, IEnumerable<string>>();

private readonly List<PatternGroup> _excludeGroups = new List<PatternGroup>();
private readonly Matcher _matcher = new Matcher();

Expand DownExpand Up@@ -80,15 +85,47 @@ public PatternGroup ExcludeGroup(PatternGroup group)
return this;
}

public IEnumerable<string> SearchFiles(string rootPath)
public IEnumerable<string> SearchFiles(string rootDirectory)
{
var patternUnionKey = new FourStringTuple(rootDirectory,
(IncludePatterns.Any() ? string.Join(", ", IncludePatterns): ""),
(IncludeLiterals.Any() ? string.Join(", ", IncludeLiterals) : ""),
(ExcludePatterns.Any() ? string.Join(", ", ExcludePatterns) : ""));

IEnumerable<string> resolvedFiles;
lock (s_resolvedFilesCache)
{
if (s_resolvedFilesCache.TryGetValue(patternUnionKey, out resolvedFiles))
{
return resolvedFiles;
}
}

resolvedFiles = ResolveFilesFromPatterns(rootDirectory, IncludePatterns, IncludeLiterals, ExcludePatterns);

lock (s_resolvedFilesCache)
{
s_resolvedFilesCache.Add(patternUnionKey, resolvedFiles);
}

return resolvedFiles;
}

private IEnumerable<string> ResolveFilesFromPatterns(
string rootDirectory,
IEnumerable<string> includePatterns,
IEnumerable<string> includeLiterals,
IEnumerable<string> excludePatterns)
{
IEnumerable<string> resolvedFiles;

// literal included files are added at the last, but the search happens early
// so as to make the process fail early in case there is missing file. fail early
// helps to avoid unnecessary globing for performance optimization
var literalIncludedFiles = new List<string>();
foreach (var literalRelativePath in IncludeLiterals)
{
var fullPath = Path.GetFullPath(Path.Combine(rootPath, literalRelativePath));
var fullPath = Path.GetFullPath(Path.Combine(rootDirectory, literalRelativePath));

if (!File.Exists(fullPath))
{
Expand All@@ -100,24 +137,33 @@ public IEnumerable<string> SearchFiles(string rootPath)
}

// globing files
var globbingResults = _matcher.GetResultsInFullPath(rootPath);
var globbingResults = _matcher.GetResultsInFullPath(rootDirectory);

// if there is no results generated in globing, skip excluding other groups
// for performance optimization.
if (globbingResults.Any())
{
foreach (var group in _excludeGroups)
{
globbingResults = globbingResults.Except(group.SearchFiles(rootPath));
globbingResults = globbingResults.Except(group.SearchFiles(rootDirectory));
}
}

return globbingResults.Concat(literalIncludedFiles).Distinct();
resolvedFiles = globbingResults.Concat(literalIncludedFiles).Distinct();
return resolvedFiles;
}

public override string ToString()
{
return string.Format("Pattern group: Literals [{0}] Includes [{1}] Excludes [{2}]", string.Join(", ", IncludeLiterals), string.Join(", ", IncludePatterns), string.Join(", ", ExcludePatterns));
}

public static void ClearCache()
{
if (s_resolvedFilesCache != null)
{
s_resolvedFilesCache.Clear();
}
}
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@ namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContext
{
private readonly Dictionary<Tuple<string, string, string>, LibraryExporter> _cachedExporters =
new Dictionary<Tuple<string, string, string>, LibraryExporter>();

private string[] _runtimeFallbacks;

public ProjectContextIdentity Identity { get; }
Expand DownExpand Up@@ -71,18 +74,34 @@ internal ProjectContext(

public LibraryExporter CreateExporter(string configuration, string buildBasePath = null)
{
LibraryExporter exporter;
var libraryExporterCacheKey = Tuple.Create(
configuration ?? "",
buildBasePath ?? "",
RootDirectory);

if (_cachedExporters.TryGetValue(libraryExporterCacheKey, out exporter))
{
return exporter;
}

if (IsPortable && RuntimeIdentifier != null && _runtimeFallbacks == null)
{
var graph = RuntimeGraphCollector.Collect(LibraryManager.GetLibraries());
_runtimeFallbacks = graph.ExpandRuntime(RuntimeIdentifier).ToArray();
}
return new LibraryExporter(RootProject,

exporter = new LibraryExporter(RootProject,
LibraryManager,
configuration,
RuntimeIdentifier,
_runtimeFallbacks,
buildBasePath,
RootDirectory);

_cachedExporters[libraryExporterCacheKey] = exporter;

return exporter;
}

/// <summary>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,8 @@ private static void FormatEventTimeStat(StringBuilder builder, PerfTraceEvent e,
AppendTime(builder, e.Duration.TotalSeconds / root.Duration.TotalSeconds, 0.2);
}
AppendTime(builder, e.Duration.TotalSeconds / parent?.Duration.TotalSeconds, 0.5);
builder.Append($"{e.Duration.ToString("ss\\.fff\\s").Blue()}]");
builder.Append($"{(int)e.Duration.TotalSeconds}.{e.Duration.Milliseconds:000}s".Blue());
builder.Append("]");
}

private static void AppendTime(StringBuilder builder, double? percent, double treshold)
Expand Down
128 changes: 90 additions & 38 deletions src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class LibraryExporter
private readonly string _buildBasePath;
private readonly string _solutionRootPath;

private List<LibraryExport> _cachedExports;

public LibraryExporter(ProjectDescription rootProject,
LibraryManager manager,
string configuration,
Expand DownExpand Up@@ -84,62 +86,112 @@ public IEnumerable<LibraryExport> GetDependencies(LibraryType type)
/// </summary>
private IEnumerable<LibraryExport> ExportLibraries(Func<LibraryDescription, bool> condition)
{
var seenMetadataReferences = new HashSet<string>();
// Project Exports cannot be cached because the binding redirect file
// for desktop apps is not added to runtimeassets of the project
// until after the project is built.
var cache = GetCacheWithRefreshedProjectExports();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
foreach (var export in cache)
{
if (!condition(library))
if (!condition(export.Library))
{
continue;
}
yield return export;
}
}

var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);
private IEnumerable<LibraryExport> GetCacheWithRefreshedProjectExports()
{
if (_cachedExports == null)
{
_cachedExports = CalculateAllExports().ToList();
}

var seenMetadataReferences = new HashSet<string>();
var refreshedCache = new LibraryExport[_cachedExports.Count()];

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
int index = 0;
foreach (var export in _cachedExports)
{
if (Equals(export.Library.Identity.Type, LibraryType.Project))
{
if (seenMetadataReferences.Add(reference.Name))
{
compilationAssemblies.Add(reference);
}
refreshedCache[index++] = GenerateExportFromLibrary(seenMetadataReferences, export.Library);
}

// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
else
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
refreshedCache[index++] = export;
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
foreach (var reference in export.CompilationAssemblies)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
seenMetadataReferences.Add(reference.Name);
}
else
}

return refreshedCache;
}

private IEnumerable<LibraryExport> CalculateAllExports()
{
var seenMetadataReferences = new HashSet<string>();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
{
yield return GenerateExportFromLibrary(seenMetadataReferences, library);
}
}

private LibraryExport GenerateExportFromLibrary(
HashSet<string> seenMetadataReferences,
LibraryDescription library)
{
var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
{
if (seenMetadataReferences.Add(reference.Name))
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
compilationAssemblies.Add(reference);
}
}

yield return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
}
else
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
}

return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
}

private IEnumerable<LibraryAssetGroup> TrimAssetGroups(IEnumerable<LibraryAssetGroup> runtimeAssemblyGroups,
Expand Down
56 changes: 51 additions & 5 deletions src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,15 @@
using Microsoft.DotNet.ProjectModel.FileSystemGlobbing;
using Newtonsoft.Json.Linq;

using FourStringTuple = System.Tuple<string, string, string, string>;

namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{
private static readonly Dictionary<FourStringTuple, IEnumerable<string>> s_resolvedFilesCache =
new Dictionary<FourStringTuple, IEnumerable<string>>();

private readonly List<PatternGroup> _excludeGroups = new List<PatternGroup>();
private readonly Matcher _matcher = new Matcher();

Expand DownExpand Up@@ -80,15 +85,47 @@ public PatternGroup ExcludeGroup(PatternGroup group)
return this;
}

public IEnumerable<string> SearchFiles(string rootPath)
public IEnumerable<string> SearchFiles(string rootDirectory)
{
var patternUnionKey = new FourStringTuple(rootDirectory,
(IncludePatterns.Any() ? string.Join(", ", IncludePatterns): ""),
(IncludeLiterals.Any() ? string.Join(", ", IncludeLiterals) : ""),
(ExcludePatterns.Any() ? string.Join(", ", ExcludePatterns) : ""));

IEnumerable<string> resolvedFiles;
lock (s_resolvedFilesCache)
{
if (s_resolvedFilesCache.TryGetValue(patternUnionKey, out resolvedFiles))
{
return resolvedFiles;
}
}

resolvedFiles = ResolveFilesFromPatterns(rootDirectory, IncludePatterns, IncludeLiterals, ExcludePatterns);

lock (s_resolvedFilesCache)
{
s_resolvedFilesCache.Add(patternUnionKey, resolvedFiles);
}

return resolvedFiles;
}

private IEnumerable<string> ResolveFilesFromPatterns(
string rootDirectory,
IEnumerable<string> includePatterns,
IEnumerable<string> includeLiterals,
IEnumerable<string> excludePatterns)
{
IEnumerable<string> resolvedFiles;

// literal included files are added at the last, but the search happens early
// so as to make the process fail early in case there is missing file. fail early
// helps to avoid unnecessary globing for performance optimization
var literalIncludedFiles = new List<string>();
foreach (var literalRelativePath in IncludeLiterals)
{
var fullPath = Path.GetFullPath(Path.Combine(rootPath, literalRelativePath));
var fullPath = Path.GetFullPath(Path.Combine(rootDirectory, literalRelativePath));

if (!File.Exists(fullPath))
{
Expand All@@ -100,24 +137,33 @@ public IEnumerable<string> SearchFiles(string rootPath)
}

// globing files
var globbingResults = _matcher.GetResultsInFullPath(rootPath);
var globbingResults = _matcher.GetResultsInFullPath(rootDirectory);

// if there is no results generated in globing, skip excluding other groups
// for performance optimization.
if (globbingResults.Any())
{
foreach (var group in _excludeGroups)
{
globbingResults = globbingResults.Except(group.SearchFiles(rootPath));
globbingResults = globbingResults.Except(group.SearchFiles(rootDirectory));
}
}

return globbingResults.Concat(literalIncludedFiles).Distinct();
resolvedFiles = globbingResults.Concat(literalIncludedFiles).Distinct();
return resolvedFiles;
}

public override string ToString()
{
return string.Format("Pattern group: Literals [{0}] Includes [{1}] Excludes [{2}]", string.Join(", ", IncludeLiterals), string.Join(", ", IncludePatterns), string.Join(", ", ExcludePatterns));
}

public static void ClearCache()
{
if (s_resolvedFilesCache != null)
{
s_resolvedFilesCache.Clear();
}
}
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@ namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContext
{
private readonly Dictionary<Tuple<string, string, string>, LibraryExporter> _cachedExporters =
new Dictionary<Tuple<string, string, string>, LibraryExporter>();

private string[] _runtimeFallbacks;

public ProjectContextIdentity Identity { get; }
Expand DownExpand Up@@ -71,18 +74,34 @@ internal ProjectContext(

public LibraryExporter CreateExporter(string configuration, string buildBasePath = null)
{
LibraryExporter exporter;
var libraryExporterCacheKey = Tuple.Create(
configuration ?? "",
buildBasePath ?? "",
RootDirectory);

if (_cachedExporters.TryGetValue(libraryExporterCacheKey, out exporter))
{
return exporter;
}

if (IsPortable && RuntimeIdentifier != null && _runtimeFallbacks == null)
{
var graph = RuntimeGraphCollector.Collect(LibraryManager.GetLibraries());
_runtimeFallbacks = graph.ExpandRuntime(RuntimeIdentifier).ToArray();
}
return new LibraryExporter(RootProject,

exporter = new LibraryExporter(RootProject,
LibraryManager,
configuration,
RuntimeIdentifier,
_runtimeFallbacks,
buildBasePath,
RootDirectory);

_cachedExporters[libraryExporterCacheKey] = exporter;

return exporter;
}

/// <summary>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,8 @@ private static void FormatEventTimeStat(StringBuilder builder, PerfTraceEvent e,
AppendTime(builder, e.Duration.TotalSeconds / root.Duration.TotalSeconds, 0.2);
}
AppendTime(builder, e.Duration.TotalSeconds / parent?.Duration.TotalSeconds, 0.5);
builder.Append($"{e.Duration.ToString("ss\\.fff\\s").Blue()}]");
builder.Append($"{(int)e.Duration.TotalSeconds}.{e.Duration.Milliseconds:000}s".Blue());
builder.Append("]");
}

private static void AppendTime(StringBuilder builder, double? percent, double treshold)
Expand Down
128 changes: 90 additions & 38 deletions src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class LibraryExporter
private readonly string _buildBasePath;
private readonly string _solutionRootPath;

private List<LibraryExport> _cachedExports;

public LibraryExporter(ProjectDescription rootProject,
LibraryManager manager,
string configuration,
Expand DownExpand Up@@ -84,62 +86,112 @@ public IEnumerable<LibraryExport> GetDependencies(LibraryType type)
/// </summary>
private IEnumerable<LibraryExport> ExportLibraries(Func<LibraryDescription, bool> condition)
{
var seenMetadataReferences = new HashSet<string>();
// Project Exports cannot be cached because the binding redirect file
// for desktop apps is not added to runtimeassets of the project
// until after the project is built.
var cache = GetCacheWithRefreshedProjectExports();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
foreach (var export in cache)
{
if (!condition(library))
if (!condition(export.Library))
{
continue;
}
yield return export;
}
}

var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);
private IEnumerable<LibraryExport> GetCacheWithRefreshedProjectExports()
{
if (_cachedExports == null)
{
_cachedExports = CalculateAllExports().ToList();
}

var seenMetadataReferences = new HashSet<string>();
var refreshedCache = new LibraryExport[_cachedExports.Count()];

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
int index = 0;
foreach (var export in _cachedExports)
{
if (Equals(export.Library.Identity.Type, LibraryType.Project))
{
if (seenMetadataReferences.Add(reference.Name))
{
compilationAssemblies.Add(reference);
}
refreshedCache[index++] = GenerateExportFromLibrary(seenMetadataReferences, export.Library);
}

// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
else
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
refreshedCache[index++] = export;
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
foreach (var reference in export.CompilationAssemblies)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
seenMetadataReferences.Add(reference.Name);
}
else
}

return refreshedCache;
}

private IEnumerable<LibraryExport> CalculateAllExports()
{
var seenMetadataReferences = new HashSet<string>();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
{
yield return GenerateExportFromLibrary(seenMetadataReferences, library);
}
}

private LibraryExport GenerateExportFromLibrary(
HashSet<string> seenMetadataReferences,
LibraryDescription library)
{
var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
{
if (seenMetadataReferences.Add(reference.Name))
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
compilationAssemblies.Add(reference);
}
}

yield return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
}
else
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
}

return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
}

private IEnumerable<LibraryAssetGroup> TrimAssetGroups(IEnumerable<LibraryAssetGroup> runtimeAssemblyGroups,
Expand Down
56 changes: 51 additions & 5 deletions src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,15 @@
using Microsoft.DotNet.ProjectModel.FileSystemGlobbing;
using Newtonsoft.Json.Linq;

using FourStringTuple = System.Tuple<string, string, string, string>;

namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{
private static readonly Dictionary<FourStringTuple, IEnumerable<string>> s_resolvedFilesCache =
new Dictionary<FourStringTuple, IEnumerable<string>>();

private readonly List<PatternGroup> _excludeGroups = new List<PatternGroup>();
private readonly Matcher _matcher = new Matcher();

Expand DownExpand Up@@ -80,15 +85,47 @@ public PatternGroup ExcludeGroup(PatternGroup group)
return this;
}

public IEnumerable<string> SearchFiles(string rootPath)
public IEnumerable<string> SearchFiles(string rootDirectory)
{
var patternUnionKey = new FourStringTuple(rootDirectory,
(IncludePatterns.Any() ? string.Join(", ", IncludePatterns): ""),
(IncludeLiterals.Any() ? string.Join(", ", IncludeLiterals) : ""),
(ExcludePatterns.Any() ? string.Join(", ", ExcludePatterns) : ""));

IEnumerable<string> resolvedFiles;
lock (s_resolvedFilesCache)
{
if (s_resolvedFilesCache.TryGetValue(patternUnionKey, out resolvedFiles))
{
return resolvedFiles;
}
}

resolvedFiles = ResolveFilesFromPatterns(rootDirectory, IncludePatterns, IncludeLiterals, ExcludePatterns);

lock (s_resolvedFilesCache)
{
s_resolvedFilesCache.Add(patternUnionKey, resolvedFiles);
}

return resolvedFiles;
}

private IEnumerable<string> ResolveFilesFromPatterns(
string rootDirectory,
IEnumerable<string> includePatterns,
IEnumerable<string> includeLiterals,
IEnumerable<string> excludePatterns)
{
IEnumerable<string> resolvedFiles;

// literal included files are added at the last, but the search happens early
// so as to make the process fail early in case there is missing file. fail early
// helps to avoid unnecessary globing for performance optimization
var literalIncludedFiles = new List<string>();
foreach (var literalRelativePath in IncludeLiterals)
{
var fullPath = Path.GetFullPath(Path.Combine(rootPath, literalRelativePath));
var fullPath = Path.GetFullPath(Path.Combine(rootDirectory, literalRelativePath));

if (!File.Exists(fullPath))
{
Expand All@@ -100,24 +137,33 @@ public IEnumerable<string> SearchFiles(string rootPath)
}

// globing files
var globbingResults = _matcher.GetResultsInFullPath(rootPath);
var globbingResults = _matcher.GetResultsInFullPath(rootDirectory);

// if there is no results generated in globing, skip excluding other groups
// for performance optimization.
if (globbingResults.Any())
{
foreach (var group in _excludeGroups)
{
globbingResults = globbingResults.Except(group.SearchFiles(rootPath));
globbingResults = globbingResults.Except(group.SearchFiles(rootDirectory));
}
}

return globbingResults.Concat(literalIncludedFiles).Distinct();
resolvedFiles = globbingResults.Concat(literalIncludedFiles).Distinct();
return resolvedFiles;
}

public override string ToString()
{
return string.Format("Pattern group: Literals [{0}] Includes [{1}] Excludes [{2}]", string.Join(", ", IncludeLiterals), string.Join(", ", IncludePatterns), string.Join(", ", ExcludePatterns));
}

public static void ClearCache()
{
if (s_resolvedFilesCache != null)
{
s_resolvedFilesCache.Clear();
}
}
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@ namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContext
{
private readonly Dictionary<Tuple<string, string, string>, LibraryExporter> _cachedExporters =
new Dictionary<Tuple<string, string, string>, LibraryExporter>();

private string[] _runtimeFallbacks;

public ProjectContextIdentity Identity { get; }
Expand DownExpand Up@@ -71,18 +74,34 @@ internal ProjectContext(

public LibraryExporter CreateExporter(string configuration, string buildBasePath = null)
{
LibraryExporter exporter;
var libraryExporterCacheKey = Tuple.Create(
configuration ?? "",
buildBasePath ?? "",
RootDirectory);

if (_cachedExporters.TryGetValue(libraryExporterCacheKey, out exporter))
{
return exporter;
}

if (IsPortable && RuntimeIdentifier != null && _runtimeFallbacks == null)
{
var graph = RuntimeGraphCollector.Collect(LibraryManager.GetLibraries());
_runtimeFallbacks = graph.ExpandRuntime(RuntimeIdentifier).ToArray();
}
return new LibraryExporter(RootProject,

exporter = new LibraryExporter(RootProject,
LibraryManager,
configuration,
RuntimeIdentifier,
_runtimeFallbacks,
buildBasePath,
RootDirectory);

_cachedExporters[libraryExporterCacheKey] = exporter;

return exporter;
}

/// <summary>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,8 @@ private static void FormatEventTimeStat(StringBuilder builder, PerfTraceEvent e,
AppendTime(builder, e.Duration.TotalSeconds / root.Duration.TotalSeconds, 0.2);
}
AppendTime(builder, e.Duration.TotalSeconds / parent?.Duration.TotalSeconds, 0.5);
builder.Append($"{e.Duration.ToString("ss\\.fff\\s").Blue()}]");
builder.Append($"{(int)e.Duration.TotalSeconds}.{e.Duration.Milliseconds:000}s".Blue());
builder.Append("]");
}

private static void AppendTime(StringBuilder builder, double? percent, double treshold)
Expand Down
128 changes: 90 additions & 38 deletions src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class LibraryExporter
private readonly string _buildBasePath;
private readonly string _solutionRootPath;

private List<LibraryExport> _cachedExports;

public LibraryExporter(ProjectDescription rootProject,
LibraryManager manager,
string configuration,
Expand DownExpand Up@@ -84,62 +86,112 @@ public IEnumerable<LibraryExport> GetDependencies(LibraryType type)
/// </summary>
private IEnumerable<LibraryExport> ExportLibraries(Func<LibraryDescription, bool> condition)
{
var seenMetadataReferences = new HashSet<string>();
// Project Exports cannot be cached because the binding redirect file
// for desktop apps is not added to runtimeassets of the project
// until after the project is built.
var cache = GetCacheWithRefreshedProjectExports();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
foreach (var export in cache)
{
if (!condition(library))
if (!condition(export.Library))
{
continue;
}
yield return export;
}
}

var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);
private IEnumerable<LibraryExport> GetCacheWithRefreshedProjectExports()
{
if (_cachedExports == null)
{
_cachedExports = CalculateAllExports().ToList();
}

var seenMetadataReferences = new HashSet<string>();
var refreshedCache = new LibraryExport[_cachedExports.Count()];

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
int index = 0;
foreach (var export in _cachedExports)
{
if (Equals(export.Library.Identity.Type, LibraryType.Project))
{
if (seenMetadataReferences.Add(reference.Name))
{
compilationAssemblies.Add(reference);
}
refreshedCache[index++] = GenerateExportFromLibrary(seenMetadataReferences, export.Library);
}

// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
else
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
refreshedCache[index++] = export;
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
foreach (var reference in export.CompilationAssemblies)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
seenMetadataReferences.Add(reference.Name);
}
else
}

return refreshedCache;
}

private IEnumerable<LibraryExport> CalculateAllExports()
{
var seenMetadataReferences = new HashSet<string>();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
{
yield return GenerateExportFromLibrary(seenMetadataReferences, library);
}
}

private LibraryExport GenerateExportFromLibrary(
HashSet<string> seenMetadataReferences,
LibraryDescription library)
{
var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
{
if (seenMetadataReferences.Add(reference.Name))
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
compilationAssemblies.Add(reference);
}
}

yield return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
}
else
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
}

return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
}

private IEnumerable<LibraryAssetGroup> TrimAssetGroups(IEnumerable<LibraryAssetGroup> runtimeAssemblyGroups,
Expand Down
56 changes: 51 additions & 5 deletions src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,15 @@
using Microsoft.DotNet.ProjectModel.FileSystemGlobbing;
using Newtonsoft.Json.Linq;

using FourStringTuple = System.Tuple<string, string, string, string>;

namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{
private static readonly Dictionary<FourStringTuple, IEnumerable<string>> s_resolvedFilesCache =
new Dictionary<FourStringTuple, IEnumerable<string>>();

private readonly List<PatternGroup> _excludeGroups = new List<PatternGroup>();
private readonly Matcher _matcher = new Matcher();

Expand DownExpand Up@@ -80,15 +85,47 @@ public PatternGroup ExcludeGroup(PatternGroup group)
return this;
}

public IEnumerable<string> SearchFiles(string rootPath)
public IEnumerable<string> SearchFiles(string rootDirectory)
{
var patternUnionKey = new FourStringTuple(rootDirectory,
(IncludePatterns.Any() ? string.Join(", ", IncludePatterns): ""),
(IncludeLiterals.Any() ? string.Join(", ", IncludeLiterals) : ""),
(ExcludePatterns.Any() ? string.Join(", ", ExcludePatterns) : ""));

IEnumerable<string> resolvedFiles;
lock (s_resolvedFilesCache)
{
if (s_resolvedFilesCache.TryGetValue(patternUnionKey, out resolvedFiles))
{
return resolvedFiles;
}
}

resolvedFiles = ResolveFilesFromPatterns(rootDirectory, IncludePatterns, IncludeLiterals, ExcludePatterns);

lock (s_resolvedFilesCache)
{
s_resolvedFilesCache.Add(patternUnionKey, resolvedFiles);
}

return resolvedFiles;
}

private IEnumerable<string> ResolveFilesFromPatterns(
string rootDirectory,
IEnumerable<string> includePatterns,
IEnumerable<string> includeLiterals,
IEnumerable<string> excludePatterns)
{
IEnumerable<string> resolvedFiles;

// literal included files are added at the last, but the search happens early
// so as to make the process fail early in case there is missing file. fail early
// helps to avoid unnecessary globing for performance optimization
var literalIncludedFiles = new List<string>();
foreach (var literalRelativePath in IncludeLiterals)
{
var fullPath = Path.GetFullPath(Path.Combine(rootPath, literalRelativePath));
var fullPath = Path.GetFullPath(Path.Combine(rootDirectory, literalRelativePath));

if (!File.Exists(fullPath))
{
Expand All@@ -100,24 +137,33 @@ public IEnumerable<string> SearchFiles(string rootPath)
}

// globing files
var globbingResults = _matcher.GetResultsInFullPath(rootPath);
var globbingResults = _matcher.GetResultsInFullPath(rootDirectory);

// if there is no results generated in globing, skip excluding other groups
// for performance optimization.
if (globbingResults.Any())
{
foreach (var group in _excludeGroups)
{
globbingResults = globbingResults.Except(group.SearchFiles(rootPath));
globbingResults = globbingResults.Except(group.SearchFiles(rootDirectory));
}
}

return globbingResults.Concat(literalIncludedFiles).Distinct();
resolvedFiles = globbingResults.Concat(literalIncludedFiles).Distinct();
return resolvedFiles;
}

public override string ToString()
{
return string.Format("Pattern group: Literals [{0}] Includes [{1}] Excludes [{2}]", string.Join(", ", IncludeLiterals), string.Join(", ", IncludePatterns), string.Join(", ", ExcludePatterns));
}

public static void ClearCache()
{
if (s_resolvedFilesCache != null)
{
s_resolvedFilesCache.Clear();
}
}
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@ namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContext
{
private readonly Dictionary<Tuple<string, string, string>, LibraryExporter> _cachedExporters =
new Dictionary<Tuple<string, string, string>, LibraryExporter>();

private string[] _runtimeFallbacks;

public ProjectContextIdentity Identity { get; }
Expand DownExpand Up@@ -71,18 +74,34 @@ internal ProjectContext(

public LibraryExporter CreateExporter(string configuration, string buildBasePath = null)
{
LibraryExporter exporter;
var libraryExporterCacheKey = Tuple.Create(
configuration ?? "",
buildBasePath ?? "",
RootDirectory);

if (_cachedExporters.TryGetValue(libraryExporterCacheKey, out exporter))
{
return exporter;
}

if (IsPortable && RuntimeIdentifier != null && _runtimeFallbacks == null)
{
var graph = RuntimeGraphCollector.Collect(LibraryManager.GetLibraries());
_runtimeFallbacks = graph.ExpandRuntime(RuntimeIdentifier).ToArray();
}
return new LibraryExporter(RootProject,

exporter = new LibraryExporter(RootProject,
LibraryManager,
configuration,
RuntimeIdentifier,
_runtimeFallbacks,
buildBasePath,
RootDirectory);

_cachedExporters[libraryExporterCacheKey] = exporter;

return exporter;
}

/// <summary>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,8 @@ private static void FormatEventTimeStat(StringBuilder builder, PerfTraceEvent e,
AppendTime(builder, e.Duration.TotalSeconds / root.Duration.TotalSeconds, 0.2);
}
AppendTime(builder, e.Duration.TotalSeconds / parent?.Duration.TotalSeconds, 0.5);
builder.Append($"{e.Duration.ToString("ss\\.fff\\s").Blue()}]");
builder.Append($"{(int)e.Duration.TotalSeconds}.{e.Duration.Milliseconds:000}s".Blue());
builder.Append("]");
}

private static void AppendTime(StringBuilder builder, double? percent, double treshold)
Expand Down
128 changes: 90 additions & 38 deletions src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class LibraryExporter
private readonly string _buildBasePath;
private readonly string _solutionRootPath;

private List<LibraryExport> _cachedExports;

public LibraryExporter(ProjectDescription rootProject,
LibraryManager manager,
string configuration,
Expand DownExpand Up@@ -84,62 +86,112 @@ public IEnumerable<LibraryExport> GetDependencies(LibraryType type)
/// </summary>
private IEnumerable<LibraryExport> ExportLibraries(Func<LibraryDescription, bool> condition)
{
var seenMetadataReferences = new HashSet<string>();
// Project Exports cannot be cached because the binding redirect file
// for desktop apps is not added to runtimeassets of the project
// until after the project is built.
var cache = GetCacheWithRefreshedProjectExports();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
foreach (var export in cache)
{
if (!condition(library))
if (!condition(export.Library))
{
continue;
}
yield return export;
}
}

var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);
private IEnumerable<LibraryExport> GetCacheWithRefreshedProjectExports()
{
if (_cachedExports == null)
{
_cachedExports = CalculateAllExports().ToList();
}

var seenMetadataReferences = new HashSet<string>();
var refreshedCache = new LibraryExport[_cachedExports.Count()];

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
int index = 0;
foreach (var export in _cachedExports)
{
if (Equals(export.Library.Identity.Type, LibraryType.Project))
{
if (seenMetadataReferences.Add(reference.Name))
{
compilationAssemblies.Add(reference);
}
refreshedCache[index++] = GenerateExportFromLibrary(seenMetadataReferences, export.Library);
}

// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
else
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
refreshedCache[index++] = export;
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
foreach (var reference in export.CompilationAssemblies)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
seenMetadataReferences.Add(reference.Name);
}
else
}

return refreshedCache;
}

private IEnumerable<LibraryExport> CalculateAllExports()
{
var seenMetadataReferences = new HashSet<string>();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
{
yield return GenerateExportFromLibrary(seenMetadataReferences, library);
}
}

private LibraryExport GenerateExportFromLibrary(
HashSet<string> seenMetadataReferences,
LibraryDescription library)
{
var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
{
if (seenMetadataReferences.Add(reference.Name))
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
compilationAssemblies.Add(reference);
}
}

yield return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
}
else
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
}

return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
}

private IEnumerable<LibraryAssetGroup> TrimAssetGroups(IEnumerable<LibraryAssetGroup> runtimeAssemblyGroups,
Expand Down
56 changes: 51 additions & 5 deletions src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,15 @@
using Microsoft.DotNet.ProjectModel.FileSystemGlobbing;
using Newtonsoft.Json.Linq;

using FourStringTuple = System.Tuple<string, string, string, string>;

namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{
private static readonly Dictionary<FourStringTuple, IEnumerable<string>> s_resolvedFilesCache =
new Dictionary<FourStringTuple, IEnumerable<string>>();

private readonly List<PatternGroup> _excludeGroups = new List<PatternGroup>();
private readonly Matcher _matcher = new Matcher();

Expand DownExpand Up@@ -80,15 +85,47 @@ public PatternGroup ExcludeGroup(PatternGroup group)
return this;
}

public IEnumerable<string> SearchFiles(string rootPath)
public IEnumerable<string> SearchFiles(string rootDirectory)
{
var patternUnionKey = new FourStringTuple(rootDirectory,
(IncludePatterns.Any() ? string.Join(", ", IncludePatterns): ""),
(IncludeLiterals.Any() ? string.Join(", ", IncludeLiterals) : ""),
(ExcludePatterns.Any() ? string.Join(", ", ExcludePatterns) : ""));

IEnumerable<string> resolvedFiles;
lock (s_resolvedFilesCache)
{
if (s_resolvedFilesCache.TryGetValue(patternUnionKey, out resolvedFiles))
{
return resolvedFiles;
}
}

resolvedFiles = ResolveFilesFromPatterns(rootDirectory, IncludePatterns, IncludeLiterals, ExcludePatterns);

lock (s_resolvedFilesCache)
{
s_resolvedFilesCache.Add(patternUnionKey, resolvedFiles);
}

return resolvedFiles;
}

private IEnumerable<string> ResolveFilesFromPatterns(
string rootDirectory,
IEnumerable<string> includePatterns,
IEnumerable<string> includeLiterals,
IEnumerable<string> excludePatterns)
{
IEnumerable<string> resolvedFiles;

// literal included files are added at the last, but the search happens early
// so as to make the process fail early in case there is missing file. fail early
// helps to avoid unnecessary globing for performance optimization
var literalIncludedFiles = new List<string>();
foreach (var literalRelativePath in IncludeLiterals)
{
var fullPath = Path.GetFullPath(Path.Combine(rootPath, literalRelativePath));
var fullPath = Path.GetFullPath(Path.Combine(rootDirectory, literalRelativePath));

if (!File.Exists(fullPath))
{
Expand All@@ -100,24 +137,33 @@ public IEnumerable<string> SearchFiles(string rootPath)
}

// globing files
var globbingResults = _matcher.GetResultsInFullPath(rootPath);
var globbingResults = _matcher.GetResultsInFullPath(rootDirectory);

// if there is no results generated in globing, skip excluding other groups
// for performance optimization.
if (globbingResults.Any())
{
foreach (var group in _excludeGroups)
{
globbingResults = globbingResults.Except(group.SearchFiles(rootPath));
globbingResults = globbingResults.Except(group.SearchFiles(rootDirectory));
}
}

return globbingResults.Concat(literalIncludedFiles).Distinct();
resolvedFiles = globbingResults.Concat(literalIncludedFiles).Distinct();
return resolvedFiles;
}

public override string ToString()
{
return string.Format("Pattern group: Literals [{0}] Includes [{1}] Excludes [{2}]", string.Join(", ", IncludeLiterals), string.Join(", ", IncludePatterns), string.Join(", ", ExcludePatterns));
}

public static void ClearCache()
{
if (s_resolvedFilesCache != null)
{
s_resolvedFilesCache.Clear();
}
}
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@ namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContext
{
private readonly Dictionary<Tuple<string, string, string>, LibraryExporter> _cachedExporters =
new Dictionary<Tuple<string, string, string>, LibraryExporter>();

private string[] _runtimeFallbacks;

public ProjectContextIdentity Identity { get; }
Expand DownExpand Up@@ -71,18 +74,34 @@ internal ProjectContext(

public LibraryExporter CreateExporter(string configuration, string buildBasePath = null)
{
LibraryExporter exporter;
var libraryExporterCacheKey = Tuple.Create(
configuration ?? "",
buildBasePath ?? "",
RootDirectory);

if (_cachedExporters.TryGetValue(libraryExporterCacheKey, out exporter))
{
return exporter;
}

if (IsPortable && RuntimeIdentifier != null && _runtimeFallbacks == null)
{
var graph = RuntimeGraphCollector.Collect(LibraryManager.GetLibraries());
_runtimeFallbacks = graph.ExpandRuntime(RuntimeIdentifier).ToArray();
}
return new LibraryExporter(RootProject,

exporter = new LibraryExporter(RootProject,
LibraryManager,
configuration,
RuntimeIdentifier,
_runtimeFallbacks,
buildBasePath,
RootDirectory);

_cachedExporters[libraryExporterCacheKey] = exporter;

return exporter;
}

/// <summary>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,8 @@ private static void FormatEventTimeStat(StringBuilder builder, PerfTraceEvent e,
AppendTime(builder, e.Duration.TotalSeconds / root.Duration.TotalSeconds, 0.2);
}
AppendTime(builder, e.Duration.TotalSeconds / parent?.Duration.TotalSeconds, 0.5);
builder.Append($"{e.Duration.ToString("ss\\.fff\\s").Blue()}]");
builder.Append($"{(int)e.Duration.TotalSeconds}.{e.Duration.Milliseconds:000}s".Blue());
builder.Append("]");
}

private static void AppendTime(StringBuilder builder, double? percent, double treshold)
Expand Down
128 changes: 90 additions & 38 deletions src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class LibraryExporter
private readonly string _buildBasePath;
private readonly string _solutionRootPath;

private List<LibraryExport> _cachedExports;

public LibraryExporter(ProjectDescription rootProject,
LibraryManager manager,
string configuration,
Expand DownExpand Up@@ -84,62 +86,112 @@ public IEnumerable<LibraryExport> GetDependencies(LibraryType type)
/// </summary>
private IEnumerable<LibraryExport> ExportLibraries(Func<LibraryDescription, bool> condition)
{
var seenMetadataReferences = new HashSet<string>();
// Project Exports cannot be cached because the binding redirect file
// for desktop apps is not added to runtimeassets of the project
// until after the project is built.
var cache = GetCacheWithRefreshedProjectExports();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
foreach (var export in cache)
{
if (!condition(library))
if (!condition(export.Library))
{
continue;
}
yield return export;
}
}

var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);
private IEnumerable<LibraryExport> GetCacheWithRefreshedProjectExports()
{
if (_cachedExports == null)
{
_cachedExports = CalculateAllExports().ToList();
}

var seenMetadataReferences = new HashSet<string>();
var refreshedCache = new LibraryExport[_cachedExports.Count()];

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
int index = 0;
foreach (var export in _cachedExports)
{
if (Equals(export.Library.Identity.Type, LibraryType.Project))
{
if (seenMetadataReferences.Add(reference.Name))
{
compilationAssemblies.Add(reference);
}
refreshedCache[index++] = GenerateExportFromLibrary(seenMetadataReferences, export.Library);
}

// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
else
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
refreshedCache[index++] = export;
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
foreach (var reference in export.CompilationAssemblies)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
seenMetadataReferences.Add(reference.Name);
}
else
}

return refreshedCache;
}

private IEnumerable<LibraryExport> CalculateAllExports()
{
var seenMetadataReferences = new HashSet<string>();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
{
yield return GenerateExportFromLibrary(seenMetadataReferences, library);
}
}

private LibraryExport GenerateExportFromLibrary(
HashSet<string> seenMetadataReferences,
LibraryDescription library)
{
var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
{
if (seenMetadataReferences.Add(reference.Name))
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
compilationAssemblies.Add(reference);
}
}

yield return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
}
else
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
}

return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
}

private IEnumerable<LibraryAssetGroup> TrimAssetGroups(IEnumerable<LibraryAssetGroup> runtimeAssemblyGroups,
Expand Down
56 changes: 51 additions & 5 deletions src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,15 @@
using Microsoft.DotNet.ProjectModel.FileSystemGlobbing;
using Newtonsoft.Json.Linq;

using FourStringTuple = System.Tuple<string, string, string, string>;

namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{
private static readonly Dictionary<FourStringTuple, IEnumerable<string>> s_resolvedFilesCache =
new Dictionary<FourStringTuple, IEnumerable<string>>();

private readonly List<PatternGroup> _excludeGroups = new List<PatternGroup>();
private readonly Matcher _matcher = new Matcher();

Expand DownExpand Up@@ -80,15 +85,47 @@ public PatternGroup ExcludeGroup(PatternGroup group)
return this;
}

public IEnumerable<string> SearchFiles(string rootPath)
public IEnumerable<string> SearchFiles(string rootDirectory)
{
var patternUnionKey = new FourStringTuple(rootDirectory,
(IncludePatterns.Any() ? string.Join(", ", IncludePatterns): ""),
(IncludeLiterals.Any() ? string.Join(", ", IncludeLiterals) : ""),
(ExcludePatterns.Any() ? string.Join(", ", ExcludePatterns) : ""));

IEnumerable<string> resolvedFiles;
lock (s_resolvedFilesCache)
{
if (s_resolvedFilesCache.TryGetValue(patternUnionKey, out resolvedFiles))
{
return resolvedFiles;
}
}

resolvedFiles = ResolveFilesFromPatterns(rootDirectory, IncludePatterns, IncludeLiterals, ExcludePatterns);

lock (s_resolvedFilesCache)
{
s_resolvedFilesCache.Add(patternUnionKey, resolvedFiles);
}

return resolvedFiles;
}

private IEnumerable<string> ResolveFilesFromPatterns(
string rootDirectory,
IEnumerable<string> includePatterns,
IEnumerable<string> includeLiterals,
IEnumerable<string> excludePatterns)
{
IEnumerable<string> resolvedFiles;

// literal included files are added at the last, but the search happens early
// so as to make the process fail early in case there is missing file. fail early
// helps to avoid unnecessary globing for performance optimization
var literalIncludedFiles = new List<string>();
foreach (var literalRelativePath in IncludeLiterals)
{
var fullPath = Path.GetFullPath(Path.Combine(rootPath, literalRelativePath));
var fullPath = Path.GetFullPath(Path.Combine(rootDirectory, literalRelativePath));

if (!File.Exists(fullPath))
{
Expand All@@ -100,24 +137,33 @@ public IEnumerable<string> SearchFiles(string rootPath)
}

// globing files
var globbingResults = _matcher.GetResultsInFullPath(rootPath);
var globbingResults = _matcher.GetResultsInFullPath(rootDirectory);

// if there is no results generated in globing, skip excluding other groups
// for performance optimization.
if (globbingResults.Any())
{
foreach (var group in _excludeGroups)
{
globbingResults = globbingResults.Except(group.SearchFiles(rootPath));
globbingResults = globbingResults.Except(group.SearchFiles(rootDirectory));
}
}

return globbingResults.Concat(literalIncludedFiles).Distinct();
resolvedFiles = globbingResults.Concat(literalIncludedFiles).Distinct();
return resolvedFiles;
}

public override string ToString()
{
return string.Format("Pattern group: Literals [{0}] Includes [{1}] Excludes [{2}]", string.Join(", ", IncludeLiterals), string.Join(", ", IncludePatterns), string.Join(", ", ExcludePatterns));
}

public static void ClearCache()
{
if (s_resolvedFilesCache != null)
{
s_resolvedFilesCache.Clear();
}
}
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@ namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContext
{
private readonly Dictionary<Tuple<string, string, string>, LibraryExporter> _cachedExporters =
new Dictionary<Tuple<string, string, string>, LibraryExporter>();

private string[] _runtimeFallbacks;

public ProjectContextIdentity Identity { get; }
Expand DownExpand Up@@ -71,18 +74,34 @@ internal ProjectContext(

public LibraryExporter CreateExporter(string configuration, string buildBasePath = null)
{
LibraryExporter exporter;
var libraryExporterCacheKey = Tuple.Create(
configuration ?? "",
buildBasePath ?? "",
RootDirectory);

if (_cachedExporters.TryGetValue(libraryExporterCacheKey, out exporter))
{
return exporter;
}

if (IsPortable && RuntimeIdentifier != null && _runtimeFallbacks == null)
{
var graph = RuntimeGraphCollector.Collect(LibraryManager.GetLibraries());
_runtimeFallbacks = graph.ExpandRuntime(RuntimeIdentifier).ToArray();
}
return new LibraryExporter(RootProject,

exporter = new LibraryExporter(RootProject,
LibraryManager,
configuration,
RuntimeIdentifier,
_runtimeFallbacks,
buildBasePath,
RootDirectory);

_cachedExporters[libraryExporterCacheKey] = exporter;

return exporter;
}

/// <summary>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,8 @@ private static void FormatEventTimeStat(StringBuilder builder, PerfTraceEvent e,
AppendTime(builder, e.Duration.TotalSeconds / root.Duration.TotalSeconds, 0.2);
}
AppendTime(builder, e.Duration.TotalSeconds / parent?.Duration.TotalSeconds, 0.5);
builder.Append($"{e.Duration.ToString("ss\\.fff\\s").Blue()}]");
builder.Append($"{(int)e.Duration.TotalSeconds}.{e.Duration.Milliseconds:000}s".Blue());
builder.Append("]");
}

private static void AppendTime(StringBuilder builder, double? percent, double treshold)
Expand Down
128 changes: 90 additions & 38 deletions src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class LibraryExporter
private readonly string _buildBasePath;
private readonly string _solutionRootPath;

private List<LibraryExport> _cachedExports;

public LibraryExporter(ProjectDescription rootProject,
LibraryManager manager,
string configuration,
Expand DownExpand Up@@ -84,62 +86,112 @@ public IEnumerable<LibraryExport> GetDependencies(LibraryType type)
/// </summary>
private IEnumerable<LibraryExport> ExportLibraries(Func<LibraryDescription, bool> condition)
{
var seenMetadataReferences = new HashSet<string>();
// Project Exports cannot be cached because the binding redirect file
// for desktop apps is not added to runtimeassets of the project
// until after the project is built.
var cache = GetCacheWithRefreshedProjectExports();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
foreach (var export in cache)
{
if (!condition(library))
if (!condition(export.Library))
{
continue;
}
yield return export;
}
}

var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);
private IEnumerable<LibraryExport> GetCacheWithRefreshedProjectExports()
{
if (_cachedExports == null)
{
_cachedExports = CalculateAllExports().ToList();
}

var seenMetadataReferences = new HashSet<string>();
var refreshedCache = new LibraryExport[_cachedExports.Count()];

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
int index = 0;
foreach (var export in _cachedExports)
{
if (Equals(export.Library.Identity.Type, LibraryType.Project))
{
if (seenMetadataReferences.Add(reference.Name))
{
compilationAssemblies.Add(reference);
}
refreshedCache[index++] = GenerateExportFromLibrary(seenMetadataReferences, export.Library);
}

// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
else
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
refreshedCache[index++] = export;
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
foreach (var reference in export.CompilationAssemblies)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
seenMetadataReferences.Add(reference.Name);
}
else
}

return refreshedCache;
}

private IEnumerable<LibraryExport> CalculateAllExports()
{
var seenMetadataReferences = new HashSet<string>();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
{
yield return GenerateExportFromLibrary(seenMetadataReferences, library);
}
}

private LibraryExport GenerateExportFromLibrary(
HashSet<string> seenMetadataReferences,
LibraryDescription library)
{
var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
{
if (seenMetadataReferences.Add(reference.Name))
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
compilationAssemblies.Add(reference);
}
}

yield return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
}
else
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
}

return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
}

private IEnumerable<LibraryAssetGroup> TrimAssetGroups(IEnumerable<LibraryAssetGroup> runtimeAssemblyGroups,
Expand Down
56 changes: 51 additions & 5 deletions src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,15 @@
using Microsoft.DotNet.ProjectModel.FileSystemGlobbing;
using Newtonsoft.Json.Linq;

using FourStringTuple = System.Tuple<string, string, string, string>;

namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{
private static readonly Dictionary<FourStringTuple, IEnumerable<string>> s_resolvedFilesCache =
new Dictionary<FourStringTuple, IEnumerable<string>>();

private readonly List<PatternGroup> _excludeGroups = new List<PatternGroup>();
private readonly Matcher _matcher = new Matcher();

Expand DownExpand Up@@ -80,15 +85,47 @@ public PatternGroup ExcludeGroup(PatternGroup group)
return this;
}

public IEnumerable<string> SearchFiles(string rootPath)
public IEnumerable<string> SearchFiles(string rootDirectory)
{
var patternUnionKey = new FourStringTuple(rootDirectory,
(IncludePatterns.Any() ? string.Join(", ", IncludePatterns): ""),
(IncludeLiterals.Any() ? string.Join(", ", IncludeLiterals) : ""),
(ExcludePatterns.Any() ? string.Join(", ", ExcludePatterns) : ""));

IEnumerable<string> resolvedFiles;
lock (s_resolvedFilesCache)
{
if (s_resolvedFilesCache.TryGetValue(patternUnionKey, out resolvedFiles))
{
return resolvedFiles;
}
}

resolvedFiles = ResolveFilesFromPatterns(rootDirectory, IncludePatterns, IncludeLiterals, ExcludePatterns);

lock (s_resolvedFilesCache)
{
s_resolvedFilesCache.Add(patternUnionKey, resolvedFiles);
}

return resolvedFiles;
}

private IEnumerable<string> ResolveFilesFromPatterns(
string rootDirectory,
IEnumerable<string> includePatterns,
IEnumerable<string> includeLiterals,
IEnumerable<string> excludePatterns)
{
IEnumerable<string> resolvedFiles;

// literal included files are added at the last, but the search happens early
// so as to make the process fail early in case there is missing file. fail early
// helps to avoid unnecessary globing for performance optimization
var literalIncludedFiles = new List<string>();
foreach (var literalRelativePath in IncludeLiterals)
{
var fullPath = Path.GetFullPath(Path.Combine(rootPath, literalRelativePath));
var fullPath = Path.GetFullPath(Path.Combine(rootDirectory, literalRelativePath));

if (!File.Exists(fullPath))
{
Expand All@@ -100,24 +137,33 @@ public IEnumerable<string> SearchFiles(string rootPath)
}

// globing files
var globbingResults = _matcher.GetResultsInFullPath(rootPath);
var globbingResults = _matcher.GetResultsInFullPath(rootDirectory);

// if there is no results generated in globing, skip excluding other groups
// for performance optimization.
if (globbingResults.Any())
{
foreach (var group in _excludeGroups)
{
globbingResults = globbingResults.Except(group.SearchFiles(rootPath));
globbingResults = globbingResults.Except(group.SearchFiles(rootDirectory));
}
}

return globbingResults.Concat(literalIncludedFiles).Distinct();
resolvedFiles = globbingResults.Concat(literalIncludedFiles).Distinct();
return resolvedFiles;
}

public override string ToString()
{
return string.Format("Pattern group: Literals [{0}] Includes [{1}] Excludes [{2}]", string.Join(", ", IncludeLiterals), string.Join(", ", IncludePatterns), string.Join(", ", ExcludePatterns));
}

public static void ClearCache()
{
if (s_resolvedFilesCache != null)
{
s_resolvedFilesCache.Clear();
}
}
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@ namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContext
{
private readonly Dictionary<Tuple<string, string, string>, LibraryExporter> _cachedExporters =
new Dictionary<Tuple<string, string, string>, LibraryExporter>();

private string[] _runtimeFallbacks;

public ProjectContextIdentity Identity { get; }
Expand DownExpand Up@@ -71,18 +74,34 @@ internal ProjectContext(

public LibraryExporter CreateExporter(string configuration, string buildBasePath = null)
{
LibraryExporter exporter;
var libraryExporterCacheKey = Tuple.Create(
configuration ?? "",
buildBasePath ?? "",
RootDirectory);

if (_cachedExporters.TryGetValue(libraryExporterCacheKey, out exporter))
{
return exporter;
}

if (IsPortable && RuntimeIdentifier != null && _runtimeFallbacks == null)
{
var graph = RuntimeGraphCollector.Collect(LibraryManager.GetLibraries());
_runtimeFallbacks = graph.ExpandRuntime(RuntimeIdentifier).ToArray();
}
return new LibraryExporter(RootProject,

exporter = new LibraryExporter(RootProject,
LibraryManager,
configuration,
RuntimeIdentifier,
_runtimeFallbacks,
buildBasePath,
RootDirectory);

_cachedExporters[libraryExporterCacheKey] = exporter;

return exporter;
}

/// <summary>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,8 @@ private static void FormatEventTimeStat(StringBuilder builder, PerfTraceEvent e,
AppendTime(builder, e.Duration.TotalSeconds / root.Duration.TotalSeconds, 0.2);
}
AppendTime(builder, e.Duration.TotalSeconds / parent?.Duration.TotalSeconds, 0.5);
builder.Append($"{e.Duration.ToString("ss\\.fff\\s").Blue()}]");
builder.Append($"{(int)e.Duration.TotalSeconds}.{e.Duration.Milliseconds:000}s".Blue());
builder.Append("]");
}

private static void AppendTime(StringBuilder builder, double? percent, double treshold)
Expand Down
128 changes: 90 additions & 38 deletions src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ public class LibraryExporter
private readonly string _buildBasePath;
private readonly string _solutionRootPath;

private List<LibraryExport> _cachedExports;

public LibraryExporter(ProjectDescription rootProject,
LibraryManager manager,
string configuration,
Expand DownExpand Up@@ -84,62 +86,112 @@ public IEnumerable<LibraryExport> GetDependencies(LibraryType type)
/// </summary>
private IEnumerable<LibraryExport> ExportLibraries(Func<LibraryDescription, bool> condition)
{
var seenMetadataReferences = new HashSet<string>();
// Project Exports cannot be cached because the binding redirect file
// for desktop apps is not added to runtimeassets of the project
// until after the project is built.
var cache = GetCacheWithRefreshedProjectExports();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
foreach (var export in cache)
{
if (!condition(library))
if (!condition(export.Library))
{
continue;
}
yield return export;
}
}

var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);
private IEnumerable<LibraryExport> GetCacheWithRefreshedProjectExports()
{
if (_cachedExports == null)
{
_cachedExports = CalculateAllExports().ToList();
}

var seenMetadataReferences = new HashSet<string>();
var refreshedCache = new LibraryExport[_cachedExports.Count()];

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
int index = 0;
foreach (var export in _cachedExports)
{
if (Equals(export.Library.Identity.Type, LibraryType.Project))
{
if (seenMetadataReferences.Add(reference.Name))
{
compilationAssemblies.Add(reference);
}
refreshedCache[index++] = GenerateExportFromLibrary(seenMetadataReferences, export.Library);
}

// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
else
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
refreshedCache[index++] = export;
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
foreach (var reference in export.CompilationAssemblies)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
seenMetadataReferences.Add(reference.Name);
}
else
}

return refreshedCache;
}

private IEnumerable<LibraryExport> CalculateAllExports()
{
var seenMetadataReferences = new HashSet<string>();

// Iterate over libraries in the library manager
foreach (var library in LibraryManager.GetLibraries())
{
yield return GenerateExportFromLibrary(seenMetadataReferences, library);
}
}

private LibraryExport GenerateExportFromLibrary(
HashSet<string> seenMetadataReferences,
LibraryDescription library)
{
var compilationAssemblies = new List<LibraryAsset>();
var sourceReferences = new List<LibraryAsset>();
var analyzerReferences = new List<AnalyzerReference>();
var libraryExport = GetExport(library);

// We need to filter out source references from non-root libraries,
// so we rebuild the library export
foreach (var reference in libraryExport.CompilationAssemblies)
{
if (seenMetadataReferences.Add(reference.Name))
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
compilationAssemblies.Add(reference);
}
}

yield return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
// Source and analyzer references are not transitive
if (library.Parents.Contains(_rootProject))
{
sourceReferences.AddRange(libraryExport.SourceReferences);
analyzerReferences.AddRange(libraryExport.AnalyzerReferences);
}

var builder = LibraryExportBuilder.Create(library);
if (_runtime != null && _runtimeFallbacks != null)
{
// For portable apps that are built with runtime trimming we replace RuntimeAssemblyGroups and NativeLibraryGroups
// with single default group that contains asset specific to runtime we are trimming for
// based on runtime fallback list
builder.WithRuntimeAssemblyGroups(TrimAssetGroups(libraryExport.RuntimeAssemblyGroups, _runtimeFallbacks));
builder.WithNativeLibraryGroups(TrimAssetGroups(libraryExport.NativeLibraryGroups, _runtimeFallbacks));
}
else
{
builder.WithRuntimeAssemblyGroups(libraryExport.RuntimeAssemblyGroups);
builder.WithNativeLibraryGroups(libraryExport.NativeLibraryGroups);
}

return builder
.WithCompilationAssemblies(compilationAssemblies)
.WithSourceReferences(sourceReferences)
.WithRuntimeAssets(libraryExport.RuntimeAssets)
.WithEmbedddedResources(libraryExport.EmbeddedResources)
.WithAnalyzerReference(analyzerReferences)
.WithResourceAssemblies(libraryExport.ResourceAssemblies)
.Build();
}

private IEnumerable<LibraryAssetGroup> TrimAssetGroups(IEnumerable<LibraryAssetGroup> runtimeAssemblyGroups,
Expand Down
56 changes: 51 additions & 5 deletions src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,10 +8,15 @@
using Microsoft.DotNet.ProjectModel.FileSystemGlobbing;
using Newtonsoft.Json.Linq;

using FourStringTuple = System.Tuple<string, string, string, string>;

namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{
private static readonly Dictionary<FourStringTuple, IEnumerable<string>> s_resolvedFilesCache =
new Dictionary<FourStringTuple, IEnumerable<string>>();

private readonly List<PatternGroup> _excludeGroups = new List<PatternGroup>();
private readonly Matcher _matcher = new Matcher();

Expand DownExpand Up@@ -80,15 +85,47 @@ public PatternGroup ExcludeGroup(PatternGroup group)
return this;
}

public IEnumerable<string> SearchFiles(string rootPath)
public IEnumerable<string> SearchFiles(string rootDirectory)
{
var patternUnionKey = new FourStringTuple(rootDirectory,
(IncludePatterns.Any() ? string.Join(", ", IncludePatterns): ""),
(IncludeLiterals.Any() ? string.Join(", ", IncludeLiterals) : ""),
(ExcludePatterns.Any() ? string.Join(", ", ExcludePatterns) : ""));

IEnumerable<string> resolvedFiles;
lock (s_resolvedFilesCache)
{
if (s_resolvedFilesCache.TryGetValue(patternUnionKey, out resolvedFiles))
{
return resolvedFiles;
}
}

resolvedFiles = ResolveFilesFromPatterns(rootDirectory, IncludePatterns, IncludeLiterals, ExcludePatterns);

lock (s_resolvedFilesCache)
{
s_resolvedFilesCache.Add(patternUnionKey, resolvedFiles);
}

return resolvedFiles;
}

private IEnumerable<string> ResolveFilesFromPatterns(
string rootDirectory,
IEnumerable<string> includePatterns,
IEnumerable<string> includeLiterals,
IEnumerable<string> excludePatterns)
{
IEnumerable<string> resolvedFiles;

// literal included files are added at the last, but the search happens early
// so as to make the process fail early in case there is missing file. fail early
// helps to avoid unnecessary globing for performance optimization
var literalIncludedFiles = new List<string>();
foreach (var literalRelativePath in IncludeLiterals)
{
var fullPath = Path.GetFullPath(Path.Combine(rootPath, literalRelativePath));
var fullPath = Path.GetFullPath(Path.Combine(rootDirectory, literalRelativePath));

if (!File.Exists(fullPath))
{
Expand All@@ -100,24 +137,33 @@ public IEnumerable<string> SearchFiles(string rootPath)
}

// globing files
var globbingResults = _matcher.GetResultsInFullPath(rootPath);
var globbingResults = _matcher.GetResultsInFullPath(rootDirectory);

// if there is no results generated in globing, skip excluding other groups
// for performance optimization.
if (globbingResults.Any())
{
foreach (var group in _excludeGroups)
{
globbingResults = globbingResults.Except(group.SearchFiles(rootPath));
globbingResults = globbingResults.Except(group.SearchFiles(rootDirectory));
}
}

return globbingResults.Concat(literalIncludedFiles).Distinct();
resolvedFiles = globbingResults.Concat(literalIncludedFiles).Distinct();
return resolvedFiles;
}

public override string ToString()
{
return string.Format("Pattern group: Literals [{0}] Includes [{1}] Excludes [{2}]", string.Join(", ", IncludeLiterals), string.Join(", ", IncludePatterns), string.Join(", ", ExcludePatterns));
}

public static void ClearCache()
{
if (s_resolvedFilesCache != null)
{
s_resolvedFilesCache.Clear();
}
}
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@ namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContext
{
private readonly Dictionary<Tuple<string, string, string>, LibraryExporter> _cachedExporters =
new Dictionary<Tuple<string, string, string>, LibraryExporter>();

private string[] _runtimeFallbacks;

public ProjectContextIdentity Identity { get; }
Expand DownExpand Up@@ -71,18 +74,34 @@ internal ProjectContext(

public LibraryExporter CreateExporter(string configuration, string buildBasePath = null)
{
LibraryExporter exporter;
var libraryExporterCacheKey = Tuple.Create(
configuration ?? "",
buildBasePath ?? "",
RootDirectory);

if (_cachedExporters.TryGetValue(libraryExporterCacheKey, out exporter))
{
return exporter;
}

if (IsPortable && RuntimeIdentifier != null && _runtimeFallbacks == null)
{
var graph = RuntimeGraphCollector.Collect(LibraryManager.GetLibraries());
_runtimeFallbacks = graph.ExpandRuntime(RuntimeIdentifier).ToArray();
}
return new LibraryExporter(RootProject,

exporter = new LibraryExporter(RootProject,
LibraryManager,
configuration,
RuntimeIdentifier,
_runtimeFallbacks,
buildBasePath,
RootDirectory);

_cachedExporters[libraryExporterCacheKey] = exporter;

return exporter;
}

/// <summary>
Expand Down
Loading