From 574c71612b6c24ef0cef0ecf4b344a4f5f0f544e Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 22 May 2024 15:42:38 -0500 Subject: [PATCH 1/2] [repo] Fix variable usage in test-aot-compatibility script (#5645) --- build/scripts/test-aot-compatibility.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/test-aot-compatibility.ps1 b/build/scripts/test-aot-compatibility.ps1 index c7fc3acf7d8..895055a1b48 100644 --- a/build/scripts/test-aot-compatibility.ps1 +++ b/build/scripts/test-aot-compatibility.ps1 @@ -44,7 +44,7 @@ $testPassed = 0 if ($actualWarningCount -ne $expectedWarningCount) { $testPassed = 1 - Write-Host "Actual warning count:", actualWarningCount, "is not as expected. Expected warning count is:", $expectedWarningCount + Write-Host "Actual warning count:", $actualWarningCount, "is not as expected. Expected warning count is:", $expectedWarningCount } Exit $testPassed From 361a4b9bd8d73879194b860ea01e6a62978d9aa1 Mon Sep 17 00:00:00 2001 From: Reiley Yang Date: Thu, 23 May 2024 12:40:23 -0700 Subject: [PATCH 2/2] [docs] Move docker related files to examples folder (#5640) Co-authored-by: Mikel Blanchard Co-authored-by: Cijo Thomas --- .../metrics/exemplars => examples/AspNetCore}/docker-compose.yaml | 0 .../exemplars => examples/AspNetCore}/grafana-datasources.yaml | 0 .../metrics/exemplars => examples/AspNetCore}/otel-collector.yaml | 0 {docs/metrics/exemplars => examples/AspNetCore}/prometheus.yaml | 0 {docs/metrics/exemplars => examples/AspNetCore}/tempo.yaml | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {docs/metrics/exemplars => examples/AspNetCore}/docker-compose.yaml (100%) rename {docs/metrics/exemplars => examples/AspNetCore}/grafana-datasources.yaml (100%) rename {docs/metrics/exemplars => examples/AspNetCore}/otel-collector.yaml (100%) rename {docs/metrics/exemplars => examples/AspNetCore}/prometheus.yaml (100%) rename {docs/metrics/exemplars => examples/AspNetCore}/tempo.yaml (100%) diff --git a/docs/metrics/exemplars/docker-compose.yaml b/examples/AspNetCore/docker-compose.yaml similarity index 100% rename from docs/metrics/exemplars/docker-compose.yaml rename to examples/AspNetCore/docker-compose.yaml diff --git a/docs/metrics/exemplars/grafana-datasources.yaml b/examples/AspNetCore/grafana-datasources.yaml similarity index 100% rename from docs/metrics/exemplars/grafana-datasources.yaml rename to examples/AspNetCore/grafana-datasources.yaml diff --git a/docs/metrics/exemplars/otel-collector.yaml b/examples/AspNetCore/otel-collector.yaml similarity index 100% rename from docs/metrics/exemplars/otel-collector.yaml rename to examples/AspNetCore/otel-collector.yaml diff --git a/docs/metrics/exemplars/prometheus.yaml b/examples/AspNetCore/prometheus.yaml similarity index 100% rename from docs/metrics/exemplars/prometheus.yaml rename to examples/AspNetCore/prometheus.yaml diff --git a/docs/metrics/exemplars/tempo.yaml b/examples/AspNetCore/tempo.yaml similarity index 100% rename from docs/metrics/exemplars/tempo.yaml rename to examples/AspNetCore/tempo.yaml