Merge branch 'release/7.x' of https://github.com/dotnet/dotnet-monitor into main

Author: jander-msft

eng/AfterSolutionBuild.targets

@@ -4,11 +4,12 @@
   <Import Project="$(RepoRoot)src\archives\AzureBlobStorage\ProjectsToPublish.props" />
   <Import Project="$(RepoRoot)src\archives\S3Storage\ProjectsToPublish.props" />
   <Import Project="$(RepoRoot)src\Microsoft.Diagnostics.Monitoring.StartupHook\ProjectsToPublish.props" />
+  <Import Project="$(RepoRoot)src\singlefile\dotnet-monitor\ProjectsToPublish.props" />
 
   <!-- Only publish projects after build if opt-in and not skipped -->
   <Target Name="PublishProjectsAfterBuild"
           AfterTargets="Build"
-          Condition="'$(PublishProjectsAfterBuild)' == 'true' and '$(SkipPublishProjects)' != 'true'">
+          Condition="'$(PublishProjectsAfterBuild)' == 'true' and '$(CreateArchives)' != 'true' and '$(CreateSingleFileBundles)' != 'true' and '$(SkipPublishProjects)' != 'true'">
     <CallTarget Targets="PublishProjects" />
   </Target>
 

eng/Build.props

@@ -6,4 +6,6 @@
           Condition="'$(CreateArchives)' == 'true'" />
   <Import Project="$(RepoRoot)src\archives\S3Storage\ProjectsToBuild.props"
           Condition="'$(CreateArchives)' == 'true'" />
+  <Import Project="$(RepoRoot)src\singlefile\dotnet-monitor\ProjectsToBuild.props"
+          Condition="'$(CreateSingleFileBundles)' == 'true'" />
 </Project>

eng/Common.props

@@ -4,5 +4,6 @@
     <LatestTargetFramework>net8.0</LatestTargetFramework>
     <LatestToolTargetFramework>$(LatestTargetFramework)</LatestToolTargetFramework>
     <OlderToolTargetFramework>net6.0</OlderToolTargetFramework>
+    <ArtifactsNonShippingBundlesDir>$(ArtifactsDir)bundles\$(Configuration)\NonShipping\</ArtifactsNonShippingBundlesDir>
   </PropertyGroup>
 </Project>

eng/PublishProjects.targets

@@ -1,7 +1,6 @@
 <Project>
 
   <PropertyGroup>
-    <SharedPublishProjectProperties>SelfContained=false</SharedPublishProjectProperties>
     <SharedPublishProjectProperties>$(SharedPublishProjectProperties);UseAppHost=true</SharedPublishProjectProperties>
     <SharedPublishProjectProperties>$(SharedPublishProjectProperties);PackAsTool=false</SharedPublishProjectProperties>
   </PropertyGroup>

eng/Publishing.props

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PublishDependsOnTargets>$(PublishDependsOnTargets);CollectPackageArtifactFiles;CollectVersionArtifactFiles</PublishDependsOnTargets>
+    <PublishDependsOnTargets>$(PublishDependsOnTargets);CollectPackageArtifactFiles;CollectBundleArtifactFiles;CollectVersionArtifactFiles</PublishDependsOnTargets>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,6 +18,10 @@
     <PackageFile Include="$(ArtifactsNonShippingPackagesDir)**/*.zip" IsShipping="false" />
   </ItemGroup>
 
+  <ItemGroup>
+    <BundleFile Include="$(ArtifactsNonShippingBundlesDir)*" IsShipping="false" />
+  </ItemGroup>
+
   <Target Name="CalculateBlobGroupAndBuildVersion">
     <PropertyGroup>
       <!--
@@ -200,6 +204,20 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="CollectBundleArtifactFiles"
+          DependsOnTargets="CalculateBlobGroupAndBuildVersion">
+    <ItemGroup>
+      <ItemsToPushToBlobFeed Include="@(BundleFile)"
+                             RemoveMetadata="IsShipping"
+                             Condition="'$(_BuildVersion)' != ''">
+        <!-- Place blobs into versioned container so that stable versions (or lack of version) do not collide. -->
+        <RelativeBlobPath>diagnostics/monitor/$(_BuildVersion)/%(BundleFile.Filename)%(BundleFile.Extension)</RelativeBlobPath>
+        <ManifestArtifactData Condition="'%(BundleFile.IsShipping)' != 'true'">NonShipping=true</ManifestArtifactData>
+        <PublishFlatContainer>true</PublishFlatContainer>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+  </Target>
+
   <Target Name="CollectVersionArtifactFiles"
           DependsOnTargets="CalculateBlobGroupAndBuildVersion">
     <PropertyGroup>

eng/dependabot/Versions.props

@@ -22,6 +22,10 @@
     <SwashbuckleAspNetCoreVersion>6.5.0</SwashbuckleAspNetCoreVersion>
     <AwsSdkS3Version>3.5.8.1</AwsSdkS3Version>
 
+    <!-- Release-branch specific reference -->
+    <!-- dotnet/diagnostics references -->
+    <MicrosoftDiagnosticsMonitoringShippedVersion>7.0.430602</MicrosoftDiagnosticsMonitoringShippedVersion>
+
     <!--
       Moq version & constants derived from Moq.
       The MoqInternalsVisibleTo* properties are not managed by Dependabot and may need to be updated incase a new version of Moq ever changes them.

eng/pipelines/jobs/build-archive.yml

@@ -36,6 +36,7 @@ jobs:
       -skipmanaged
       -skipnative
       /p:SkipPublishProjects=true
+      /p:CreateSingleFileBundles=true
       /p:ThirdPartyNoticesFilePath='$(Build.SourcesDirectory)/$(_TPNFile)'
 
     postBuildSteps:
@@ -44,6 +45,12 @@ jobs:
       inputs:
         SourceFolder: '$(Build.SourcesDirectory)/artifacts/packages'
         TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages'
+    
+    - task: CopyFiles@2
+      displayName: Gather Artifacts (bundles)
+      inputs:
+        SourceFolder: '$(Build.SourcesDirectory)/artifacts/bundles'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bundles'
 
     - task: PublishBuildArtifacts@1
       displayName: Publish Artifacts (Unified)

src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx

@@ -490,12 +490,13 @@
     <comment>The description provided for the DumpTempFolder parameter on StorageOptions.</comment>
   </data>
   <data name="ErrorMessage_CredentialsMissing" xml:space="preserve">
-    <value>The {0} field, {1} field, or {2} field is required.</value>
-    <comment>Gets the format string for rejecting validation due to 3 missing fields where at least one is required.
-3 Format Parameters:
+    <value>The {0} field, {1} field, {2} field, or {3} field is required.</value>
+    <comment>Gets the format string for rejecting validation due to 4 missing fields where at least one is required.
+4 Format Parameters:
 0. fieldNameOne: The name of the first field that is missing
 1. fieldNameTwo: The name of the second field that is missing
-2. fieldNameThree: The name of the third field that is missing</comment>
+2. fieldNameThree: The name of the third field that is missing
+3. fieldNameFour: The name of the fourth field that is missing</comment>
   </data>
   <data name="DisplayAttributeDescription_CollectLogsOptions_Format" xml:space="preserve">
     <value>The format of the logs artifact.</value>

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/CurrentAppDomainExceptionProcessor.cs

@@ -24,8 +24,11 @@ public void Start()
 
         private static void ConfigurePipeline(ExceptionPipelineBuilder builder)
         {
+            // Process current exception and its inner exceptions
+            builder.Add(next => new ExceptionDemultiplexerPipelineStep(next).Invoke);
             // Prevent rethrows from being evaluated; only care about origination of exceptions.
             builder.Add(next => new FilterRepeatExceptionPipelineStep(next).Invoke);
+            // Report exception through event source
             builder.Add(next => new ExceptionEventsPipelineStep(next).Invoke);
         }
     }

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/CurrentAppDomainExceptionSource.cs

@@ -25,6 +25,8 @@ public CurrentAppDomainExceptionSource()
 
         private void CurrentDomain_FirstChanceException(object? sender, FirstChanceExceptionEventArgs e)
         {
+            DateTime timestamp = DateTime.UtcNow;
+
             if (_handlingException.Value)
             {
                 // Exception handling is already in progress on this thread. The current exception is likely
@@ -38,7 +40,7 @@ private void CurrentDomain_FirstChanceException(object? sender, FirstChanceExcep
             {
                 _handlingException.Value = true;
 
-                RaiseExceptionThrown(e.Exception);
+                RaiseExceptionThrown(e.Exception, timestamp);
             }
             catch
             {