diff --git a/.github/codecov.yml b/.github/codecov.yml index df54634a71..bf6b155120 100644 --- a/.github/codecov.yml +++ b/.github/codecov.yml @@ -23,6 +23,25 @@ comment: require_changes: no ignore: - - "**.md" - - "src/OpenTelemetry.Contrib.Shared" # copied from main OTel project and has code coverage there - - "test/**/*" + - "**/*.md" + - "src/Shared" # copied from main OTel project and has code coverage there + - "test" + - "examples" + - "build" + +flags: + unittests: + carryforward: true + paths: + - src + + unittests-Exporter.OneCollector: + carryforward: true + paths: + - src/OpenTelemetry.Exporter.OneCollector + + unittests-Instrumentation.Process: + carryforward: true + paths: + - src/OpenTelemetry.Instrumentation.Process + diff --git a/.github/workflows/ci-Exporter.OneCollector.yml b/.github/workflows/ci-Exporter.OneCollector.yml new file mode 100644 index 0000000000..7af1185e2c --- /dev/null +++ b/.github/workflows/ci-Exporter.OneCollector.yml @@ -0,0 +1,57 @@ +name: Build OpenTelemetry.Exporter.OneCollector + +on: + pull_request: + branches: [ 'main*', 'exporter*' ] + paths: + - '*/OpenTelemetry.Exporter.OneCollector*/**' + - 'build/**' + - '!**.md' + +env: + PROJECT: OpenTelemetry.Exporter.OneCollector + +jobs: + build-test: + + strategy: + fail-fast: false # ensures the entire test matrix is run, even if one permutation fails + matrix: + os: [ windows-latest, ubuntu-latest ] + version: [ net462, net6.0, net7.0 ] + exclude: + - os: ubuntu-latest + version: net462 + + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + + - name: Setup dotnet + uses: actions/setup-dotnet@v3 + + - name: dotnet restore build/Projects/${{env.PROJECT}}.proj + run: dotnet restore build/Projects/${{env.PROJECT}}.proj + + - name: dotnet build build/Projects/${{env.PROJECT}}.proj + run: dotnet build build/Projects/${{env.PROJECT}}.proj --configuration Release --no-restore + + - name: dotnet test test/${{env.PROJECT}}.Tests + run: dotnet test test/${{env.PROJECT}}.Tests --collect:"Code Coverage" --results-directory:TestResults --framework ${{ matrix.version }} --configuration Release --no-restore --no-build --logger:"console;verbosity=detailed" -- RunConfiguration.DisableAppDomain=true + + - name: Install coverage tool + run: dotnet tool install -g dotnet-coverage + + - name: Merging test results + run: dotnet-coverage merge -r -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/*.coverage + + - uses: codecov/codecov-action@v3.1.4 + continue-on-error: true # Note: Don't fail for upload failures + env: + OS: ${{ matrix.os }} + TFM: ${{ matrix.version }} + with: + file: TestResults/Cobertura.xml + env_vars: OS,TFM + flags: unittests-Exporter.OneCollector + name: Code Coverage for Exporter.OneCollector on [${{ matrix.os }}.${{ matrix.version }}] diff --git a/.github/workflows/ci-Instrumentation.Process.yml b/.github/workflows/ci-Instrumentation.Process.yml index bd0b9bb5cf..d0db0b9c39 100644 --- a/.github/workflows/ci-Instrumentation.Process.yml +++ b/.github/workflows/ci-Instrumentation.Process.yml @@ -1,33 +1,57 @@ -name: Instrumentation.Process +name: Build OpenTelemetry.Instrumentation.Process on: pull_request: - branches: [ 'main*' ] + branches: [ 'main*', 'instrumentation*' ] paths: - - 'src/OpenTelemetry.Instrumentation.Process/**' - - 'test/OpenTelemetry.Instrumentation.Process.Tests/**' + - '*/OpenTelemetry.Instrumentation.Process*/**' + - 'build/**' + - '!**.md' env: - COMPONENT_NAME: OpenTelemetry.Instrumentation.Process + PROJECT: OpenTelemetry.Instrumentation.Process jobs: - unit-test: + build-test: + strategy: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ windows-latest, ubuntu-latest ] + version: [ net462, net6.0, net7.0 ] + exclude: + - os: ubuntu-latest + version: net462 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - name: Install .NET 7 SDK - uses: actions/setup-dotnet@v3.2.0 - with: - dotnet-version: '7.0.x' + - name: Setup dotnet + uses: actions/setup-dotnet@v3 + + - name: dotnet restore test/${{ env.PROJECT }}.Tests + run: dotnet restore test/${{ env.PROJECT }}.Tests + + - name: dotnet build test/${{ env.PROJECT }}.Tests + run: dotnet build test/${{ env.PROJECT }}.Tests --configuration Release --no-restore - - name: Build - run: dotnet build --configuration Release test/${{ env.COMPONENT_NAME }}.Tests/${{ env.COMPONENT_NAME }}.Tests.csproj + - name: dotnet test test/${{ env.PROJECT }}.Tests + run: dotnet test test/${{ env.PROJECT }}.Tests --collect:"Code Coverage" --results-directory:"TestResults" --framework ${{ matrix.version }} --configuration Release --no-restore --no-build --logger:"console;verbosity=detailed" -- RunConfiguration.DisableAppDomain=true - - name: Test - run: dotnet test test/${{ env.COMPONENT_NAME }}.Tests/bin/Release/**/${{ env.COMPONENT_NAME }}.Tests.dll --logger:"console;verbosity=detailed" + - name: Install coverage tool + run: dotnet tool install -g dotnet-coverage + + - name: Merging test results + run: dotnet-coverage merge -r -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/*.coverage + + - uses: codecov/codecov-action@v3.1.4 + continue-on-error: true # Note: Don't fail for upload failures + env: + OS: ${{ matrix.os }} + TFM: ${{ matrix.version }} + with: + file: TestResults/Cobertura.xml + env_vars: OS,TFM + flags: unittests-Instrumentation.Process + name: Code Coverage for Instrumentation.Process on [${{ matrix.os }}.${{ matrix.version }}] diff --git a/.github/workflows/ci-aot.yml b/.github/workflows/ci-aot.yml index ff44f35e24..676e4ccfff 100644 --- a/.github/workflows/ci-aot.yml +++ b/.github/workflows/ci-aot.yml @@ -1,13 +1,6 @@ name: Publish AOTCompatibility testApp on: - push: - branches: [ 'main*' ] - paths: - - 'src/OpenTelemetry.Instrumentation.Runtime/**' - - '!src/OpenTelemetry.Instrumentation.Runtime/README.md' - - 'src/OpenTelemetry.Instrumentation.EventCounters/**' - - '!src/OpenTelemetry.Instrumentation.EventCounters/README.md' pull_request: branches: [ 'main*' ] paths: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93d5d72a49..a67fa19e3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,14 +1,12 @@ name: Build on: - push: - branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] - paths-ignore: - - '**.md' pull_request: branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] paths-ignore: - '**.md' + - '*/OpenTelemetry.Instrumentation.Process*/**' + - '*/OpenTelemetry.Exporter.OneCollector*/**' jobs: build-test: @@ -29,11 +27,37 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v3 - - name: Install dependencies + - name: Restore run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - name: Test ${{ matrix.version }} - run: dotnet test **/bin/**/${{ matrix.version }}/*.Tests.dll --logger:"console;verbosity=detailed" + shell: pwsh + run: | + $projects = Get-ChildItem ` + -Path test/*.Tests/*.csproj ` + -Exclude OpenTelemetry.Instrumentation.Process.Tests.csproj, OpenTelemetry.Exporter.OneCollector.Tests.csproj + + ForEach ($project in $projects) + { + dotnet test $project.FullName --collect:"Code Coverage" --results-directory:"TestResults" --framework ${{ matrix.version }} --configuration Release --no-restore --no-build --logger:"console;verbosity=detailed" -- RunConfiguration.DisableAppDomain=true + } + + - name: Install coverage tool + run: dotnet tool install -g dotnet-coverage + + - name: Merging test results + run: dotnet-coverage merge -r -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/*.coverage + + - uses: codecov/codecov-action@v3.1.4 + continue-on-error: true # Note: Don't fail for upload failures + env: + OS: ${{ matrix.os }} + TFM: ${{ matrix.version }} + with: + file: TestResults/Cobertura.xml + env_vars: OS,TFM + flags: unittests + name: Code Coverage for solution on [${{ matrix.os }}.${{ matrix.version }}] diff --git a/.github/workflows/dotnet-core-cov.yml b/.github/workflows/dotnet-core-cov.yml deleted file mode 100644 index 388ac5730f..0000000000 --- a/.github/workflows/dotnet-core-cov.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Code Coverage - -on: - push: - branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] - paths-ignore: - - '**.md' - pull_request: - branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] - paths-ignore: - - '**.md' - -jobs: - build-test-report: - runs-on: ${{ matrix.os }} - - strategy: - fail-fast: false - matrix: - os: [windows-latest] - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 # fetching all - - - name: Setup dotnet - uses: actions/setup-dotnet@v3 - - - name: Install dependencies - run: dotnet restore - - - name: dotnet build - run: dotnet build --configuration Release --no-restore - - - name: dotnet test - run: dotnet test --collect:"Code Coverage" --results-directory:"TestResults" --configuration Release --no-build -- RunConfiguration.DisableAppDomain=true - - - name: Process code coverage - run: .\build\process-codecoverage.ps1 - shell: powershell - - - name: Install report tool - run: dotnet tool install -g dotnet-reportgenerator-globaltool - - - name: Merging test results - run: reportgenerator -reports:TestResults/**/*.xml -targetdir:TestResults -reporttypes:Cobertura - - - uses: codecov/codecov-action@v3.1.4 - with: - file: TestResults/Cobertura.xml - env_vars: OS - name: Code Coverage for ${{ matrix.os }} diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index f9886e9f5e..a74d0b8b66 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -1,11 +1,6 @@ name: dotnet format on: - push: - branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] - paths: - - '**.cs' - - '.editorconfig' pull_request: branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] paths: diff --git a/.github/workflows/integration-md.yml b/.github/workflows/integration-md.yml index 66a9949582..915c8e70cb 100644 --- a/.github/workflows/integration-md.yml +++ b/.github/workflows/integration-md.yml @@ -1,10 +1,6 @@ name: Integration Tests on: - push: - branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] - paths: - - '**.md' pull_request: branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] paths: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index b11a2b163c..da281d5359 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -1,10 +1,6 @@ name: Integration Tests on: - push: - branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] - paths-ignore: - - '**.md' pull_request: branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] paths-ignore: diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml index 736387a7d5..b7a318dbb8 100644 --- a/.github/workflows/markdownlint.yml +++ b/.github/workflows/markdownlint.yml @@ -1,10 +1,6 @@ name: markdownlint on: - push: - branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] - paths: - - '**.md' pull_request: branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] paths: diff --git a/.github/workflows/sanitycheck.yml b/.github/workflows/sanitycheck.yml index 6cf97382ae..67676f3b6c 100644 --- a/.github/workflows/sanitycheck.yml +++ b/.github/workflows/sanitycheck.yml @@ -1,8 +1,6 @@ name: sanitycheck on: - push: - branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] pull_request: branches: [ 'main*', 'instrumentation*', 'exporter*', 'extensions*' ] diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props index 5fcb3187f5..b82f905d82 100644 --- a/build/Common.nonprod.props +++ b/build/Common.nonprod.props @@ -21,16 +21,19 @@ Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax. --> [0.13.6,0.14) - [6.0.0,7.0.0) [2.3.1,3.0) [5.0.0,7.0) - [17.6.3,18.0) + [17.7.2,18.0) [4.18.4,5.0) $(OpenTelemetryCoreLatestVersion) $(OpenTelemetryCoreLatestPrereleaseVersion) [2.5.0,3.0) [2.5.0,3.0) [1.5.32,2.0) - + + + + + diff --git a/build/Common.props b/build/Common.props index 84556f1c15..7ed5728f63 100644 --- a/build/Common.props +++ b/build/Common.props @@ -29,7 +29,6 @@ Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax. --> [4.3.0,5.0) - [17.6.3] [2.1.0,5.0) [3.1.0,) [1.0.3,2.0) @@ -53,7 +52,6 @@ - diff --git a/build/process-codecoverage.ps1 b/build/process-codecoverage.ps1 deleted file mode 100644 index ff0bdf6d8f..0000000000 --- a/build/process-codecoverage.ps1 +++ /dev/null @@ -1,12 +0,0 @@ -[xml]$commonProps = Get-Content -Path $PSScriptRoot\Common.props -$microsoftCodeCoveragePkgVer = [string]$commonProps.Project.PropertyGroup.MicrosoftCodeCoveragePkgVer # This is collected in the format: "[16.10.0]" -$microsoftCodeCoveragePkgVer = $microsoftCodeCoveragePkgVer.Trim(); -$microsoftCodeCoveragePkgVer = $microsoftCodeCoveragePkgVer.SubString(1, $microsoftCodeCoveragePkgVer.Length - 2) # Removing square brackets -$files = Get-ChildItem "TestResults" -Filter "*.coverage" -Recurse -Write-Host $env:USERPROFILE -foreach ($file in $files) -{ - $command = $env:USERPROFILE+ '\.nuget\packages\microsoft.codecoverage\' + $microsoftCodeCoveragePkgVer + '\build\netstandard2.0\CodeCoverage\CodeCoverage.exe analyze /output:' + $file.DirectoryName + '\' + $file.Name + '.xml '+ $file.FullName - Write-Host $command - Invoke-Expression $command -} diff --git a/opentelemetry-dotnet-contrib.sln b/opentelemetry-dotnet-contrib.sln index 26a25d4d9f..9bea2b5871 100644 --- a/opentelemetry-dotnet-contrib.sln +++ b/opentelemetry-dotnet-contrib.sln @@ -9,6 +9,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{07AA0F83-22F6-4B8C-921D-029D3384CB17}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + CODEOWNERS = CODEOWNERS CONTRIBUTING.md = CONTRIBUTING.md global.json = global.json NuGet.config = NuGet.config @@ -18,8 +19,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1A06E14B-DD2F-4536-9D2E-F708C0C43555}" ProjectSection(SolutionItems) = preProject - CODEOWNERS = CODEOWNERS + .github\codecov.yml = .github\codecov.yml .github\component_owners.yml = .github\component_owners.yml + .github\dependabot.yml = .github\dependabot.yml + .github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{43CAFE52-F329-4431-87DA-7FEE1454D9A9}" @@ -27,6 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{ .github\workflows\assign-reviewers.yml = .github\workflows\assign-reviewers.yml .github\workflows\ci-aot.yml = .github\workflows\ci-aot.yml .github\workflows\ci-Exporter.OneCollector-Integration.yml = .github\workflows\ci-Exporter.OneCollector-Integration.yml + .github\workflows\ci-Exporter.OneCollector.yml = .github\workflows\ci-Exporter.OneCollector.yml .github\workflows\ci-Instrumentation.Process.yml = .github\workflows\ci-Instrumentation.Process.yml .github\workflows\ci-md.yml = .github\workflows\ci-md.yml .github\workflows\ci.yml = .github\workflows\ci.yml diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj b/test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj index c3933d601a..0bfa4aa284 100644 --- a/test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj @@ -11,25 +11,17 @@ - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + + diff --git a/test/OpenTelemetry.Exporter.InfluxDB.Tests/OpenTelemetry.Exporter.InfluxDB.Tests.csproj b/test/OpenTelemetry.Exporter.InfluxDB.Tests/OpenTelemetry.Exporter.InfluxDB.Tests.csproj index 77f722d9ed..0a8afbb0b4 100644 --- a/test/OpenTelemetry.Exporter.InfluxDB.Tests/OpenTelemetry.Exporter.InfluxDB.Tests.csproj +++ b/test/OpenTelemetry.Exporter.InfluxDB.Tests/OpenTelemetry.Exporter.InfluxDB.Tests.csproj @@ -9,12 +9,8 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj b/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj index 9327ebdc7d..8894e13e55 100644 --- a/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj @@ -8,18 +8,14 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj b/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj index e2a610d9f9..e63fc170e3 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj +++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/OpenTelemetry.Exporter.OneCollector.Tests.csproj @@ -9,12 +9,8 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj b/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj index 52327d652c..caf7104c03 100644 --- a/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj @@ -11,14 +11,10 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Extensions.AWS.Tests/OpenTelemetry.Extensions.AWS.Tests.csproj b/test/OpenTelemetry.Extensions.AWS.Tests/OpenTelemetry.Extensions.AWS.Tests.csproj index 73a3269b37..7a272b6e5c 100644 --- a/test/OpenTelemetry.Extensions.AWS.Tests/OpenTelemetry.Extensions.AWS.Tests.csproj +++ b/test/OpenTelemetry.Extensions.AWS.Tests/OpenTelemetry.Extensions.AWS.Tests.csproj @@ -6,13 +6,9 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetry.Extensions.Enrichment.Tests.csproj b/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetry.Extensions.Enrichment.Tests.csproj index bb5034a279..ea02e4ed0b 100644 --- a/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetry.Extensions.Enrichment.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetry.Extensions.Enrichment.Tests.csproj @@ -8,12 +8,8 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj b/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj index 5c804515d1..f337a44e1e 100644 --- a/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj @@ -8,13 +8,9 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj b/test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj index 45403f5832..2995cb98a4 100644 --- a/test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj @@ -8,14 +8,10 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj index 95fbba74b5..6e716a4a7a 100644 --- a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj @@ -8,13 +8,9 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj index c68c2175a8..8be1376e77 100644 --- a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj @@ -7,14 +7,13 @@ - + + + - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj index f59b1e785e..ac0591b22c 100644 --- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj @@ -6,14 +6,10 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.Cassandra.Tests/OpenTelemetry.Instrumentation.Cassandra.Tests.csproj b/test/OpenTelemetry.Instrumentation.Cassandra.Tests/OpenTelemetry.Instrumentation.Cassandra.Tests.csproj index 95016b6ae9..717529ac0a 100644 --- a/test/OpenTelemetry.Instrumentation.Cassandra.Tests/OpenTelemetry.Instrumentation.Cassandra.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Cassandra.Tests/OpenTelemetry.Instrumentation.Cassandra.Tests.csproj @@ -7,15 +7,11 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests.csproj b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests.csproj index d380a9ce76..f86a5a1482 100644 --- a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests.csproj @@ -9,14 +9,10 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj index d5a316695c..6efa9fde6f 100644 --- a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj @@ -15,13 +15,9 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj index 81177f9a06..3bed24dd3e 100644 --- a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj @@ -7,14 +7,9 @@ - - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/OpenTelemetry.Instrumentation.GrpcCore.Tests.csproj b/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/OpenTelemetry.Instrumentation.GrpcCore.Tests.csproj index 103afee76e..aa506d3a03 100644 --- a/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/OpenTelemetry.Instrumentation.GrpcCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/OpenTelemetry.Instrumentation.GrpcCore.Tests.csproj @@ -5,14 +5,9 @@ disable - - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj index 7da4e0ba0f..8b951ec26c 100644 --- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj @@ -9,13 +9,9 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.Owin.Tests/OpenTelemetry.Instrumentation.Owin.Tests.csproj b/test/OpenTelemetry.Instrumentation.Owin.Tests/OpenTelemetry.Instrumentation.Owin.Tests.csproj index cef5be2a1d..2b113bd700 100644 --- a/test/OpenTelemetry.Instrumentation.Owin.Tests/OpenTelemetry.Instrumentation.Owin.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Owin.Tests/OpenTelemetry.Instrumentation.Owin.Tests.csproj @@ -7,12 +7,8 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.Process.Tests/OpenTelemetry.Instrumentation.Process.Tests.csproj b/test/OpenTelemetry.Instrumentation.Process.Tests/OpenTelemetry.Instrumentation.Process.Tests.csproj index a391effc6c..50bb75e806 100644 --- a/test/OpenTelemetry.Instrumentation.Process.Tests/OpenTelemetry.Instrumentation.Process.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Process.Tests/OpenTelemetry.Instrumentation.Process.Tests.csproj @@ -7,14 +7,9 @@ - - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj b/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj index 3844899e19..81596ee50a 100644 --- a/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj @@ -9,15 +9,11 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.Runtime.Tests/OpenTelemetry.Instrumentation.Runtime.Tests.csproj b/test/OpenTelemetry.Instrumentation.Runtime.Tests/OpenTelemetry.Instrumentation.Runtime.Tests.csproj index 8555b84cb5..ff5d8c5322 100644 --- a/test/OpenTelemetry.Instrumentation.Runtime.Tests/OpenTelemetry.Instrumentation.Runtime.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Runtime.Tests/OpenTelemetry.Instrumentation.Runtime.Tests.csproj @@ -7,14 +7,9 @@ - - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj index 77f29289fb..dfa8a0ba02 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj @@ -19,14 +19,10 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj b/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj index 3aa11db7b8..32a62abd6c 100644 --- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj @@ -9,13 +9,9 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/OpenTelemetry.PersistentStorage.FileSystem.Tests.csproj b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/OpenTelemetry.PersistentStorage.FileSystem.Tests.csproj index 76d872a709..f3b6f2bb07 100644 --- a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/OpenTelemetry.PersistentStorage.FileSystem.Tests.csproj +++ b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/OpenTelemetry.PersistentStorage.FileSystem.Tests.csproj @@ -7,12 +7,8 @@ - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + diff --git a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/OpenTelemetry.ResourceDetectors.AWS.Tests.csproj b/test/OpenTelemetry.ResourceDetectors.AWS.Tests/OpenTelemetry.ResourceDetectors.AWS.Tests.csproj index 12b3750bb0..0bfd267363 100644 --- a/test/OpenTelemetry.ResourceDetectors.AWS.Tests/OpenTelemetry.ResourceDetectors.AWS.Tests.csproj +++ b/test/OpenTelemetry.ResourceDetectors.AWS.Tests/OpenTelemetry.ResourceDetectors.AWS.Tests.csproj @@ -9,13 +9,9 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.ResourceDetectors.Azure.Tests/OpenTelemetry.ResourceDetectors.Azure.Tests.csproj b/test/OpenTelemetry.ResourceDetectors.Azure.Tests/OpenTelemetry.ResourceDetectors.Azure.Tests.csproj index 97f3e5715f..034ad49ca2 100644 --- a/test/OpenTelemetry.ResourceDetectors.Azure.Tests/OpenTelemetry.ResourceDetectors.Azure.Tests.csproj +++ b/test/OpenTelemetry.ResourceDetectors.Azure.Tests/OpenTelemetry.ResourceDetectors.Azure.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -7,12 +7,8 @@ - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + diff --git a/test/OpenTelemetry.ResourceDetectors.Container.Tests/OpenTelemetry.ResourceDetectors.Container.Tests.csproj b/test/OpenTelemetry.ResourceDetectors.Container.Tests/OpenTelemetry.ResourceDetectors.Container.Tests.csproj index 6c4811cb1f..ff9dc21b7b 100644 --- a/test/OpenTelemetry.ResourceDetectors.Container.Tests/OpenTelemetry.ResourceDetectors.Container.Tests.csproj +++ b/test/OpenTelemetry.ResourceDetectors.Container.Tests/OpenTelemetry.ResourceDetectors.Container.Tests.csproj @@ -9,12 +9,8 @@ - - - all - runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj b/test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj index e0fb3a51f5..24f730fd7b 100644 --- a/test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj +++ b/test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj @@ -6,12 +6,8 @@ - - - all - runtime; build; native; contentfiles; analyzers - +