Merge pull request #4307 from dotnet-maestro-bot/merge/release/8.0-to…

…-main [automated] Merge branch 'release/8.0' => 'main'
dotnet · Aug 17, 2023 · c8e34c5 · c8e34c5
2 parents b598dee + 6f38a71
commit c8e34c5
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 1,897 deletions.
diff --git a/Microsoft.Extensions.DependencyInjection.AutoActivation.json b/Microsoft.Extensions.DependencyInjection.AutoActivation.json
diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml
@@ -45,6 +45,15 @@ steps:
             /bl:${{ parameters.repoLogPath }}/restore.binlog
     displayName: Restore
 
+  - pwsh: |
+        $(Build.SourcesDirectory)/scripts/Slngen.ps1 -All -NoLaunch
+    displayName: Create solution
+
+  - script: ${{ parameters.buildScript }}
+            -restore
+            /bl:${{ parameters.repoLogPath }}/restore2.binlog
+    displayName: Restore solution
+
   - script: ${{ parameters.buildScript }}
             -build
             -configuration ${{ parameters.buildConfig }}

diff --git a/...t.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs b/...t.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs
diff --git a/...crosoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersExtensions.cs b/...crosoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersExtensions.cs