Merge main to feature/10.0 (#8027)

Author: jander-msft

.github/workflows/sync-branches.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.repository == 'dotnet/dotnet-monitor'
     strategy:
       matrix:
-        branch: ["release/8.0", "release/8.x", "release/9.x"]
+        branch: ["release/8.x", "release/9.0", "release/9.x"]
     name: 'Sync non-code to ${{ matrix.branch }}'
     runs-on: ubuntu-latest
     permissions:
@@ -52,12 +52,10 @@ jobs:
           auth_token: ${{ secrets.GITHUB_TOKEN }}
 
   sync-code:
-    # Disable code sync
-    if: false
-    #if: github.repository == 'dotnet/dotnet-monitor'
+    if: github.repository == 'dotnet/dotnet-monitor'
     strategy:
       matrix:
-        branch: ["feature/9.x"]
+        branch: ["feature/10.0"]
     name: 'Sync branch with ${{ matrix.branch }}'
     runs-on: ubuntu-latest
     permissions:

eng/pipelines/dotnet-monitor-publish.yml

@@ -0,0 +1,54 @@
+trigger: none
+pr: none
+
+parameters:
+- name: IsTestRun
+  type: boolean
+  default: true
+- name: IsDryRun
+  type: boolean
+  default: true
+
+variables:
+- template: /eng/common/templates-official/variables/pool-providers.yml@self
+- name: _TeamName
+  value: DotNetCore
+  readonly: true
+- group: Release-Pipeline
+- name: IsDryRun
+  value: ${{ parameters.IsDryRun }}
+  readonly: true
+- name: IsTestRun
+  value: ${{ parameters.IsTestRun }}
+  readonly: true
+
+resources:
+  pipelines:
+  - pipeline: dotnet-monitor_build
+    source: 'dotnet\dotnet-monitor\dotnet-dotnet-monitor'
+
+extends:
+  template: /eng/pipelines/templates/pipeline-template.yml@self
+  parameters:
+    sdl:
+      sbom:
+        enabled: false
+    stages:
+    - stage: Validation
+
+      jobs:
+      - job: Validate
+
+        variables:
+        # Allow for differentiation of runs of this pipeline
+        # when running it with the same build repeatedly.
+        - name: RunRevision
+          value: $[counter(format('{0}|{1}|{2}', variables['resources.pipeline.Build.runID'], variables['IsDryRun'], variables['IsTestRun']), 1)]
+          readonly: true
+
+        workspace:
+          clean: all
+
+        steps:
+        - download: none
+

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/CollectionRuleTests.cs

@@ -72,6 +72,7 @@ await ScenarioRunner.SingleTarget(
                 });
         }
 
+#if NET8_0_OR_GREATER
         /// <summary>
         /// Validates that a startup rule will execute and complete without action beyond
         /// discovering the target process.
@@ -110,6 +111,7 @@ await ScenarioRunner.SingleTarget(
                     ruleCompletedTask = runner.WaitForCollectionRuleCompleteAsync(DefaultRuleName);
                 });
         }
+#endif
 
         /// <summary>
         /// Validates that a non-startup rule will complete when it has an action limit specified
@@ -289,6 +291,7 @@ await ScenarioRunner.SingleTarget(
                 });
         }
 
+#if NET8_0_OR_GREATER
         /// <summary>
         /// Validates that a collection rule with a managed entry point assembly name filter can be matched to the
         /// target process.
@@ -350,6 +353,7 @@ await ScenarioRunner.SingleTarget(
                     filteredTask = runner.WaitForCollectionRuleUnmatchedFiltersAsync(DefaultRuleName);
                 });
         }
+#endif
 
         /// <summary>
         /// Validates that a change in the collection rule configuration is detected and applied correctly.

src/Tests/Microsoft.Diagnostics.Monitoring.WebApi.UnitTests/DefaultProcessConfigurationTests.cs

@@ -71,6 +71,13 @@ public void ConvertProcessConfig()
                 Value = "arg1"
             };
 
+            var filterDescriptorManagedEntryPointAssemblyName = new ProcessFilterDescriptor
+            {
+                Key = ProcessFilterKey.ManagedEntryPointAssemblyName,
+                MatchType = ProcessFilterType.Exact,
+                Value = "MyApp"
+            };
+
             var filter = CreateFilterEntry(filterDescriptorPid);
             ValidateProcessFilter(DiagProcessFilterCriteria.ProcessId, filterDescriptorPid.Value, filter);
 
@@ -90,14 +97,24 @@ public void ConvertProcessConfig()
             filter = CreateFilterEntry(filterDescriptorCommandContains);
             ValidateProcessFilter(DiagProcessFilterCriteria.CommandLine, filterDescriptorCommandContains.Value, DiagProcessFilterMatchType.Contains, filter);
 
+            filter = CreateFilterEntry(filterDescriptorManagedEntryPointAssemblyName);
+            ValidateProcessFilter(DiagProcessFilterCriteria.ManagedEntryPointAssemblyName, filterDescriptorManagedEntryPointAssemblyName.Value, filter);
+
             //This filter doesn't make any sense but we are just testing that we can combine multiple filters
-            var options = CreateOptions(filterDescriptorPid, filterDescriptorName, filterDescriptorNameContains, filterDescriptorCommand, filterDescriptorCommandContains);
+            var options = CreateOptions(
+                filterDescriptorPid,
+                filterDescriptorName,
+                filterDescriptorNameContains,
+                filterDescriptorCommand,
+                filterDescriptorCommandContains,
+                filterDescriptorManagedEntryPointAssemblyName);
 
             ValidateProcessFilter(DiagProcessFilterCriteria.ProcessId, filterDescriptorPid.Value, options.Filters[0]);
             ValidateProcessFilter(DiagProcessFilterCriteria.ProcessName, filterDescriptorName.Value, options.Filters[1]);
             ValidateProcessFilter(DiagProcessFilterCriteria.ProcessName, filterDescriptorNameContains.Value, DiagProcessFilterMatchType.Contains, options.Filters[2]);
             ValidateProcessFilter(DiagProcessFilterCriteria.CommandLine, filterDescriptorCommand.Value, options.Filters[3]);
             ValidateProcessFilter(DiagProcessFilterCriteria.CommandLine, filterDescriptorCommandContains.Value, DiagProcessFilterMatchType.Contains, options.Filters[4]);
+            ValidateProcessFilter(DiagProcessFilterCriteria.ManagedEntryPointAssemblyName, filterDescriptorManagedEntryPointAssemblyName.Value, options.Filters[5]);
         }
 
         [Fact]
@@ -115,6 +132,7 @@ public void NewCriteriaTest()
                 DiagProcessFilterCriteria.RuntimeId,
                 DiagProcessFilterCriteria.CommandLine,
                 DiagProcessFilterCriteria.ProcessName,
+                DiagProcessFilterCriteria.ManagedEntryPointAssemblyName
             };
 
             Assert.Equal(expectedValues.Length, actualValues.Length);