Upstream 26.04.21

.azure-pipelines/crank.yml

@@ -103,10 +103,13 @@ jobs:
       arguments: /nowarn:netsdk1138
       projects: |
         src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
-  
+
   - script: |
       sudo apt-get update
       sudo apt-get install -y llvm clang
+      sudo apt-get remove -y cmake
+      curl -L -o /tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v3.19.8/cmake-3.19.8-Linux-x86_64.sh
+      sudo sh /tmp/cmake.sh --prefix=/usr/local --exclude-subdir --skip-license
     displayName: install_dependencies
 
   - script: |

.azure-pipelines/integration-tests.yml

@@ -115,7 +115,7 @@ jobs:
       dockerComposeCommand: run -e TestAllPackageVersions=true -e buildConfiguration=$(buildConfiguration) -e publishTargetFramework=$(publishTargetFramework) IntegrationTests
 
   - publish: build_data
-    artifact: $(Agent.JobName)_profiler-logs
+    artifact: $(Agent.JobName)_profiler-logs-$(System.JobAttempt)
     condition: succeededOrFailed()
 
   - task: PublishTestResults@2
@@ -237,7 +237,7 @@ jobs:
       dockerComposeCommand: run -e TestAllPackageVersions=true -e buildConfiguration=$(buildConfiguration) IntegrationTests.Alpine.Core50
 
   - publish: build_data
-    artifact: $(Agent.JobName)_profiler-logs
+    artifact: $(Agent.JobName)_profiler-logs-$(System.JobAttempt)
     condition: succeededOrFailed()
 
   - task: PublishTestResults@2
@@ -459,7 +459,7 @@ jobs:
     inputs:
       solution: test/test-applications/aspnet/samples-iis.sln
       configuration: '$(buildConfiguration)'
-      msbuildArguments: '/p:DeployOnBuild=true /p:PublishProfile=FolderProfile.pubxml'
+      msbuildArguments: '/p:DeployOnBuild=true /p:PublishProfile=$(System.DefaultWorkingDirectory)/test/test-applications/aspnet/PublishProfiles/FolderProfile.pubxml'
       maximumCpuCount: true
 
   - task: DockerCompose@0

.azure-pipelines/packages.yml

@@ -116,16 +116,16 @@ stages:
         arguments: --configuration $(buildConfiguration) --framework netcoreapp3.1 --output $(tracerHome)/netcoreapp3.1
 
     - task: DockerCompose@0
-      displayName: docker-compose run -e buildConfiguration=$(buildConfiguration) Profiler
+      displayName: docker-compose run Profiler
       inputs:
         containerregistrytype: Container Registry
-        dockerComposeCommand: run Profiler
+        dockerComposeCommand: run -e buildConfiguration=$(buildConfiguration) Profiler
 
     - task: DockerCompose@0
-      displayName: docker-compose run -e buildConfiguration=$(buildConfiguration) package
+      displayName: docker-compose run package
       inputs:
         containerregistrytype: Container Registry
-        dockerComposeCommand: run package
+        dockerComposeCommand: run -e buildConfiguration=$(buildConfiguration) package
 
     - publish: deploy/linux
       artifact: linux-packages
@@ -170,16 +170,16 @@ stages:
         arguments: --configuration $(buildConfiguration) --framework netcoreapp3.1 --output $(tracerHome)/netcoreapp3.1
 
     - task: DockerCompose@0
-      displayName: docker-compose run -e buildConfiguration=$(buildConfiguration) Profiler.Alpine
+      displayName: docker-compose run Profiler.Alpine
       inputs:
         containerregistrytype: Container Registry
-        dockerComposeCommand: run Profiler.Alpine
+        dockerComposeCommand: run -e buildConfiguration=$(buildConfiguration) Profiler.Alpine
 
     - task: DockerCompose@0
-      displayName: docker-compose run -e buildConfiguration=$(buildConfiguration) package.alpine
+      displayName: docker-compose run package.alpine
       inputs:
         containerregistrytype: Container Registry
-        dockerComposeCommand: run package.alpine
+        dockerComposeCommand: run -e buildConfiguration=$(buildConfiguration) package.alpine
 
     - publish: deploy/linux
       artifact: linux-alpine-packages

.azure-pipelines/steps/install-dotnet-sdks.yml

@@ -0,0 +1,25 @@
+steps:
+- task: UseDotNet@2
+  displayName: install dotnet core sdk 2.1
+  inputs:
+    packageType: sdk
+    version: 2.1.x
+
+- task: UseDotNet@2
+  displayName: install dotnet core sdk 3.0
+  inputs:
+    packageType: sdk
+    version: 3.0.x
+
+- task: UseDotNet@2
+  displayName: install dotnet core sdk 3.1
+  inputs:
+    packageType: sdk
+    version: 3.1.x
+
+- task: UseDotNet@2
+  displayName: install dotnet core sdk 5
+  inputs:
+    packageType: sdk
+    version: $(dotnetCoreSdk5Version)
+    includePreviewVersions: true

.azure-pipelines/steps/install-dotnet.yml

@@ -0,0 +1,24 @@
+steps:
+- task: UseDotNet@2
+  displayName: install dotnet core runtime 2.1
+  inputs:
+    packageType: runtime
+    version: 2.1.x
+
+- task: UseDotNet@2
+  displayName: install dotnet core runtime 3.0
+  inputs:
+    packageType: runtime
+    version: 3.0.x
+
+- task: UseDotNet@2
+  displayName: install dotnet core runtime 3.1
+  inputs:
+    packageType: runtime
+    version: 3.1.x
+
+- task: UseDotNet@2
+  displayName: install dotnet core sdk 5.0
+  inputs:
+    packageType: sdk
+    version: $(dotnetCoreSdk5Version)