Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ci #742

Merged
merged 10 commits into from
Oct 18, 2023
Merged

Fix ci #742

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b4e6c86
Update dotnet-install.sh sha256sum
pjanotti Oct 2, 2023
c24490a
Remove netcoreapp3.0 and net5.0 from container integration tests
pjanotti Oct 17, 2023
5c35028
Set correct version for Debian curl package
pjanotti Oct 12, 2023
d7ff1e9
Do not target net5.0
pjanotti Oct 17, 2023
4787e7a
Remove large node images
pjanotti Oct 17, 2023
c10d273
Remove a few unused runner dirs
pjanotti Oct 17, 2023
ff7c5db
Completely remove net5.0 from CI
pjanotti Oct 18, 2023
2c3d04d
Don't build serverless lambda images
pjanotti Oct 18, 2023
ebd6929
Skip AwsLambdaTests on Debian too
pjanotti Oct 18, 2023
dc6692a
Do not require .NET 5.0 in docs
pjanotti Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101
- name: Build Docker image
Expand Down Expand Up @@ -178,7 +177,6 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101
- run: ./tracer/build.cmd Clean BuildTracerHome BuildAndRunManagedUnitTests
Expand All @@ -204,7 +202,6 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101
- name: Build Docker image
Expand Down Expand Up @@ -251,7 +248,6 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101
- name: Install CMake 3.19.8
Expand All @@ -277,7 +273,6 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101
- name: Build Docker image
Expand Down Expand Up @@ -313,7 +308,7 @@ jobs:
matrix:
machine: [ windows-2022 ]
platform: [ x64 ]
framework: [ net461, netcoreapp3.1, net5.0, net6.0, net7.0 ]
framework: [ net461, netcoreapp3.1, net6.0, net7.0 ]
target: [ BuildAndRunWindowsIntegrationTests, BuildAndRunWindowsRegressionTests ]
runs-on: ${{ matrix.machine }}
timeout-minutes: 60
Expand All @@ -327,7 +322,6 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101
# Cosmos is _way_ to flaky at the moment. Try enabling again at a later time
Expand Down Expand Up @@ -377,7 +371,7 @@ jobs:
fail-fast: false
matrix:
base-image: [ debian, alpine ]
framework: [ netcoreapp3.1, net5.0, net6.0, net7.0 ]
framework: [ netcoreapp3.1, net6.0, net7.0 ]
runs-on: ubuntu-20.04
timeout-minutes: 60
steps:
Expand All @@ -387,9 +381,21 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101

- name: Remove large node images
run: docker rmi node:20 node:18 node:16

- name: Remove a few unused dirs
run: sudo rm -rf \
/usr/local/lib/android /opt/ghc \
/usr/share/swift /usr/local/.ghcup \
/usr/lib/jvm || true

- name: Disk usage
run: df -h

- name: Build Docker image
run: |
docker build \
Expand All @@ -409,7 +415,7 @@ jobs:
dd-trace-dotnet/${{ matrix.base-image }}-builder \
dotnet /build/bin/Debug/_build.dll Info Clean BuildTracerHome BuildLinuxIntegrationTests -Framework ${{ matrix.framework }}
- name: Build dependencies
run: docker-compose build --build-arg SERVERLESS_ARTIFACTS_PATH=.${relativeTracerHome} serverless-lambda-no-param-sync serverless-lambda-one-param-sync serverless-lambda-two-params-sync serverless-lambda-no-param-async serverless-lambda-one-param-async serverless-lambda-two-params-async serverless-lambda-no-param-void serverless-lambda-one-param-void serverless-lambda-two-params-void
run: docker-compose build --build-arg SERVERLESS_ARTIFACTS_PATH=.${relativeTracerHome} StartDependencies
- name: Start dependencies
run: docker-compose up -d StartDependencies
- name: Run integration tests in container
Expand Down Expand Up @@ -449,7 +455,6 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101
- name: install Microsoft.Net.Component.4.6.1.TargetingPack
Expand Down Expand Up @@ -499,7 +504,6 @@ jobs:
dotnet-version: |
2.1.818
3.1.426
5.0.408
6.0.404
7.0.101
- name: install Microsoft.Net.Component.4.6.1.TargetingPack
Expand Down
28 changes: 1 addition & 27 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,18 +544,6 @@ services:
- AEROSPIKE_HOST=aerospike:3000
- COUCHBASE_HOST=couchbase
- COUCHBASE_PORT=8091
- AWS_LAMBDA_ENDPOINT_NO_PARAM_SYNC=http://serverless-lambda-no-param-sync:8080
- AWS_LAMBDA_ENDPOINT_ONE_PARAM_SYNC=http://serverless-lambda-one-param-sync:8080
- AWS_LAMBDA_ENDPOINT_TWO_PARAMS_SYNC=http://serverless-lambda-two-params-sync:8080
- AWS_LAMBDA_ENDPOINT_NO_PARAM_SYNC_WITH_CONTEXT=http://serverless-lambda-no-param-sync-with-context:8080
- AWS_LAMBDA_ENDPOINT_ONE_PARAM_SYNC_WITH_CONTEXT=http://serverless-lambda-one-param-sync-with-context:8080
- AWS_LAMBDA_ENDPOINT_TWO_PARAMS_SYNC_WITH_CONTEXT=http://serverless-lambda-two-params-sync-with-context:8080
- AWS_LAMBDA_ENDPOINT_NO_PARAM_ASYNC=http://serverless-lambda-no-param-async:8080
- AWS_LAMBDA_ENDPOINT_ONE_PARAM_ASYNC=http://serverless-lambda-one-param-async:8080
- AWS_LAMBDA_ENDPOINT_TWO_PARAMS_ASYNC=http://serverless-lambda-two-params-async:8080
- AWS_LAMBDA_ENDPOINT_NO_PARAM_VOID=http://serverless-lambda-no-param-void:8080
- AWS_LAMBDA_ENDPOINT_ONE_PARAM_VOID=http://serverless-lambda-one-param-void:8080
- AWS_LAMBDA_ENDPOINT_TWO_PARAMS_VOID=http://serverless-lambda-two-params-void:8080
- CONTAINER_HOSTNAME=http://integrationtests
hostname: integrationtests
depends_on:
Expand Down Expand Up @@ -617,23 +605,9 @@ services:
- kafka-zookeeper
- aws_sqs
- couchbase
- serverless-lambda-no-param-sync
- serverless-lambda-one-param-sync
- serverless-lambda-two-params-sync
- serverless-lambda-no-param-sync-with-context
- serverless-lambda-one-param-sync-with-context
- serverless-lambda-two-params-sync-with-context
- serverless-lambda-no-param-async
- serverless-lambda-one-param-async
- serverless-lambda-two-params-async
- serverless-lambda-no-param-void
- serverless-lambda-one-param-void
- serverless-lambda-two-params-void
- serverless-integration-extension-mock
- serverless-integration-extension-mock-with-context
environment:
- TIMEOUT_LENGTH=120
command: aerospike:3000 servicestackredis:6379 stackexchangeredis:6379 elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 sqlserver:1433 mongo:27017 postgres:5432 mysql:3306 mysql57:3306 rabbitmq:5672 kafka-broker:9092 kafka-zookeeper:2181 aws_sqs:9324 couchbase:11210 serverless-lambda-no-param-sync:8080 serverless-lambda-one-param-sync:8080 serverless-lambda-two-params-sync:8080 serverless-lambda-no-param-sync-with-context:8080 serverless-lambda-one-param-sync-with-context:8080 serverless-lambda-two-params-sync-with-context:8080 serverless-lambda-no-param-async:8080 serverless-lambda-one-param-async:8080 serverless-lambda-two-params-async:8080 serverless-integration-extension-mock:9003 serverless-integration-extension-mock-with-context:9004 serverless-lambda-no-param-void:8080 serverless-lambda-one-param-void:8080 serverless-lambda-two-params-void:8080
command: aerospike:3000 servicestackredis:6379 stackexchangeredis:6379 elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 sqlserver:1433 mongo:27017 postgres:5432 mysql:3306 mysql57:3306 rabbitmq:5672 kafka-broker:9092 kafka-zookeeper:2181 aws_sqs:9324 couchbase:11210

IntegrationTests.ARM64:
build:
Expand Down
4 changes: 1 addition & 3 deletions tracer/build/_build/docker/alpine.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,10 @@ FROM base as tester
# Install .NET Core runtimes using install script
RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "5840ce64f4186ccc4dac0c0fd8703acd0d387091ce48f310fef758e5f84d7a7f dotnet-install.sh" | sha256sum -c \
&& echo "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh --runtime aspnetcore --version 2.1.30 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 3.0.3 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 3.1.31 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 5.0.17 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 6.0.11 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

Expand Down
10 changes: 5 additions & 5 deletions tracer/build/_build/docker/debian.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt-get update \
git=1:2.20.1-2+deb10u3 \
procps=2:3.3.15-2 \
wget=1.20.1-1.1 \
curl=7.64.0-4+deb10u6 \
curl=7.64.0-4+deb10u7 \
cmake=3.13.4-1 \
make=4.2.1-1.2 \
llvm=1:7.0-47 \
Expand All @@ -46,7 +46,7 @@ RUN apt-get update \
# Install the .NET SDK
RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "5840ce64f4186ccc4dac0c0fd8703acd0d387091ce48f310fef758e5f84d7a7f dotnet-install.sh" | sha256sum -c \
&& echo "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh --version $DOTNETSDK_VERSION --install-dir /usr/share/dotnet \
&& rm ./dotnet-install.sh \
Expand Down Expand Up @@ -79,12 +79,10 @@ RUN if [ "$(uname -m)" = "x86_64" ]; \
fi \
&& curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \
&& echo "SHA256: $(sha256sum dotnet-install.sh)" \
&& echo "5840ce64f4186ccc4dac0c0fd8703acd0d387091ce48f310fef758e5f84d7a7f dotnet-install.sh" | sha256sum -c \
&& echo "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964 dotnet-install.sh" | sha256sum -c \
&& chmod +x ./dotnet-install.sh \
&& ./dotnet-install.sh --runtime $NETCORERUNTIME2_1 --version 2.1.30 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 3.0.3 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 3.1.31 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 5.0.17 --install-dir /usr/share/dotnet --no-path \
&& ./dotnet-install.sh --runtime aspnetcore --version 6.0.11 --install-dir /usr/share/dotnet --no-path \
&& rm dotnet-install.sh

Expand All @@ -93,3 +91,5 @@ RUN if [ "$(uname -m)" = "x86_64" ]; \
COPY . /build
RUN dotnet build /build
WORKDIR /project

ENV IsDebian=true
4 changes: 2 additions & 2 deletions tracer/samples/NugetDeployment/HttpListenerExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net48;netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/AWS/AwsLambdaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public AwsLambdaTests(ITestOutputHelper output)
[Trait("Category", "Lambda")]
public async Task SubmitsTraces()
{
if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("IsAlpine")))
if (Environment.GetEnvironmentVariable("IsAlpine") == "true" || Environment.GetEnvironmentVariable("IsDebian") == "true")
{
Output.WriteLine("Skipping");
return;
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/Datadog.Trace.Tools.Analyzers.Tests/Datadog.Trace.Tools.Analyzers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions tracer/test/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

<PropertyGroup>
<!-- only run .NET Framework tests on Windows -->
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>

<!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp3.0) -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions tracer/test/test-applications/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<!-- only run .NET Framework tests on Windows -->
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>

<OutputType>Exe</OutputType>
<Platforms>x64;x86</Platforms>
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/test-applications/debugger/Samples.Probes/Samples.Probes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;$(TargetFrameworks)</TargetFrameworks>
<RuntimeIdentifiers Condition="'$(OS)' == 'Windows_NT' AND '$(TargetFramework)' == 'net461'">win7-x86;win7-x64</RuntimeIdentifiers>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../LogsInjection.ILogger.VersionConflict.2x/LogsInjection.ILogger.VersionConflict.2x.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...er/test/test-applications/integrations/LogsInjection.ILogger/LogsInjection.ILogger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions .../LogsInjection.Log4Net.VersionConflict.2x/LogsInjection.Log4Net.VersionConflict.2x.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<!-- Exclude .NET Core 2.1 because it doesn't have the AssemblyLoadContext.All API-->
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...ations/LogsInjection.NLog.VersionConflict.2x/LogsInjection.NLog.VersionConflict.2x.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<!-- Exclude .NET Core 2.1 because it doesn't have the AssemblyLoadContext.All API-->
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions .../LogsInjection.Serilog.VersionConflict.2x/LogsInjection.Serilog.VersionConflict.2x.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<!-- Exclude .NET Core 2.1 because it doesn't have the AssemblyLoadContext.All API-->
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...pplications/integrations/Samples.AspNetCoreRazorPages/Samples.AspNetCoreRazorPages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<Platforms>x64;x86;AnyCPU</Platforms>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/test-applications/integrations/Samples.GraphQL4/Samples.GraphQL4.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<ApiVersion Condition="'$(ApiVersion)' == ''">5.1.1</ApiVersion>
<DefineConstants Condition="$(ApiVersion) &gt;= 5.0.0">$(DefineConstants);GRAPHQL_5_0</DefineConstants>

Expand Down
2 changes: 1 addition & 1 deletion tracer/test/test-applications/integrations/Samples.GrpcDotNet/Samples.GrpcDotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Platforms>x86;x64</Platforms>
<NoWarn>0618;NETSDK1138</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/test-applications/regression/AspNetCoreSmokeTest/AspNetCoreSmokeTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;$(TargetFrameworks)</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...st-applications/regression/AssemblyLoadContextRedirect/AssemblyLoadContextRedirect.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="2.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/test-applications/regression/Devart.Data.DBCommand/Devart.Data.DBCommand.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!--<TargetFrameworks>net461</TargetFrameworks>-->
<TargetFrameworks>net461;netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;net6.0;net7.0</TargetFrameworks>

<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext>
Expand Down
2 changes: 1 addition & 1 deletion ...MismatchedTracerVersions/Mismatched.AspNetCore/MismatchedTracerVersions.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion ...ns/regression/MismatchedTracerVersions/Mismatched.Cli/MismatchedTracerVersions.Cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net461;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net461;net6.0;net7.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
<IsPackable>false</IsPackable>
Expand Down
Loading
Loading