Merge remote-tracking branch 'upstream/develop' into native

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+<!--
+Are you targeting develop? All PRs should target the develop branch unless otherwise noted.
+-->
+
+Fixes #
+
+<!--
+Please try to make sure that there is a bug logged for the issue being fixed if one is not present.
+Especially for issues which are complex. 
+The bug should describe the problem and how to reproduce it.
+-->
+
+### Description of Change
+
+<!-- 
+Enter description of the fix in this section.
+Please be as descriptive as possible, future contributors will need to know *why* these changes are being made.
+For inspiration review the commit/PR history in the MonoGame repository.
+-->
+
+
+
+

MonoGame.Framework.Content.Pipeline/AssemblyInfo.cs

@@ -2,4 +2,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly:InternalsVisibleTo("MonoGame.Effect")]
-
+[assembly:InternalsVisibleTo("MonoGame.Tools.Tests")]

MonoGame.Framework.Content.Pipeline/Builder/PipelineImporterContext.cs

@@ -10,17 +10,21 @@ public class PipelineImporterContext : ContentImporterContext
     {
         private readonly PipelineManager _manager;
 
-        public PipelineImporterContext(PipelineManager manager)
+        private readonly PipelineBuildEvent _pipelineEvent;
+
+        public PipelineImporterContext(PipelineManager manager, PipelineBuildEvent pipelineEvent)
         {
             _manager = manager;
+            _pipelineEvent = pipelineEvent;
         }
 
         public override string IntermediateDirectory { get { return _manager.IntermediateDirectory; } }
         public override string OutputDirectory { get { return _manager.OutputDirectory; } }
         public override ContentBuildLogger Logger { get { return _manager.Logger; } }
 
         public override void AddDependency(string filename)
-        {            
+        {
+            _pipelineEvent.Dependencies.AddUnique(filename);
         }
     }
-}
+}

MonoGame.Framework.Content.Pipeline/Builder/PipelineManager.cs

@@ -86,8 +86,8 @@ private struct ProcessorInfo
         /// </summary>
         public bool CompressContent { get; set; }
 
-        /// <summary>        
-        /// If true exceptions thrown from within an importer or processor are caught and then 
+        /// <summary>
+        /// If true exceptions thrown from within an importer or processor are caught and then
         /// thrown from the context. Default value is true.
         /// </summary>
         public bool RethrowExceptions { get; set; }
@@ -108,7 +108,7 @@ public PipelineManager(string projectDir, string outputDir, string intermediateD
 
 	        RegisterCustomConverters();
 
-            // Load the previous content stats.            
+            // Load the previous content stats.
             ContentStats = new ContentStatsCollection();
             ContentStats.PreviousStats = ContentStatsCollection.Read(intermediateDir);
         }
@@ -157,9 +157,9 @@ private void ResolveAssemblies()
                 try
                 {
                     Assembly a;
-                    if (string.IsNullOrEmpty(assemblyPath))                                            
-                        a = Assembly.GetExecutingAssembly();                    
-                    else                    
+                    if (string.IsNullOrEmpty(assemblyPath))
+                        a = Assembly.GetExecutingAssembly();
+                    else
                         a = Assembly.LoadFrom(assemblyPath);
 
                     exportedTypes = a.GetTypes();
@@ -182,7 +182,7 @@ private void ResolveAssemblies()
 
                 foreach (var t in exportedTypes)
                 {
-                    if (t.IsAbstract) 
+                    if (t.IsAbstract)
                         continue;
 
                     if (t.GetInterface(@"IContentImporter") != null)
@@ -242,7 +242,7 @@ public Type[] GetImporterTypes()
 
             List<Type> types = new List<Type>();
 
-            foreach (var item in _importers) 
+            foreach (var item in _importers)
             {
                 types.Add(item.type);
             }
@@ -254,14 +254,14 @@ public Type[] GetProcessorTypes()
         {
             if (_processors == null)
                 ResolveAssemblies();
-            
+
             List<Type> types = new List<Type>();
-            
-            foreach (var item in _processors) 
+
+            foreach (var item in _processors)
             {
                 types.Add(item.type);
             }
-            
+
             return types.ToArray();
         }
 
@@ -535,7 +535,7 @@ public PipelineBuildEvent BuildContent(string sourceFilepath, string outputFilep
         {
             sourceFilepath = PathHelper.Normalize(sourceFilepath);
             ResolveOutputFilepath(sourceFilepath, ref outputFilepath);
-            
+
             ResolveImporterAndProcessor(sourceFilepath, ref importerName, ref processorName);
 
             // Record what we're building and how.
@@ -570,12 +570,12 @@ private void BuildContent(PipelineBuildEvent pipelineEvent, PipelineBuildEvent c
             // Keep track of all build events. (Required to resolve automatic names "AssetName_n".)
             TrackPipelineBuildEvent(pipelineEvent);
 
-            var rebuild = pipelineEvent.NeedsRebuild(this, cachedEvent);            
+            var rebuild = pipelineEvent.NeedsRebuild(this, cachedEvent);
             if (rebuild)
                 Logger.LogMessage("{0}", pipelineEvent.SourceFile);
             else
                 Logger.LogMessage("Skipping {0}", pipelineEvent.SourceFile);
-            
+
             Logger.Indent();
             try
             {
@@ -604,7 +604,7 @@ private void BuildContent(PipelineBuildEvent pipelineEvent, PipelineBuildEvent c
                             Parameters = assetCachedEvent.Parameters,
                         };
 
-                        // Give the asset a chance to rebuild.                    
+                        // Give the asset a chance to rebuild.
                         BuildContent(depEvent, assetCachedEvent, assetEventFilepath);
                     }
                 }
@@ -665,7 +665,10 @@ public object ProcessContent(PipelineBuildEvent pipelineEvent)
             {
                 try
                 {
-                    var importContext = new PipelineImporterContext(this);
+
+                    var importContext = new PipelineImporterContext(this, pipelineEvent);
+                    using var _ = ContextScopeFactory.BeginContext(importContext, pipelineEvent);
+
                     importedObject = importer.Import(pipelineEvent.SourceFile, importContext);
                 }
                 catch (PipelineException)
@@ -683,7 +686,8 @@ public object ProcessContent(PipelineBuildEvent pipelineEvent)
             }
             else
             {
-                var importContext = new PipelineImporterContext(this);
+                var importContext = new PipelineImporterContext(this, pipelineEvent);
+                using var _ = ContextScopeFactory.BeginContext(importContext, pipelineEvent);
                 importedObject = importer.Import(pipelineEvent.SourceFile, importContext);
             }
 
@@ -714,6 +718,7 @@ public object ProcessContent(PipelineBuildEvent pipelineEvent)
                 try
                 {
                     var processContext = new PipelineProcessorContext(this, pipelineEvent);
+                    using var _ = ContextScopeFactory.BeginContext(processContext);
                     processedObject = processor.Process(importedObject, processContext);
                 }
                 catch (PipelineException)
@@ -732,6 +737,7 @@ public object ProcessContent(PipelineBuildEvent pipelineEvent)
             else
             {
                 var processContext = new PipelineProcessorContext(this, pipelineEvent);
+                using var _ = ContextScopeFactory.BeginContext(processContext);
                 processedObject = processor.Process(importedObject, processContext);
             }
 

MonoGame.Framework.Content.Pipeline/Builder/PipelineProcessorContext.cs

@@ -52,8 +52,9 @@ public override TOutput Convert<TInput, TOutput>(   TInput input,
         {
             var processor = _manager.CreateProcessor(processorName, processorParameters);
             var processContext = new PipelineProcessorContext(_manager, new PipelineBuildEvent { Parameters = processorParameters } );
+            using var _ = ContextScopeFactory.BeginContext(processContext);
             var processedObject = processor.Process(input, processContext);
-           
+
             // Add its dependencies and built assets to ours.
             _pipelineEvent.Dependencies.AddRangeUnique(processContext._pipelineEvent.Dependencies);
             _pipelineEvent.BuildAsset.AddRangeUnique(processContext._pipelineEvent.BuildAsset);