File changes required to run the build after the directory move

DataDog · Sep 8, 2021 · 7d215e4 · 7d215e4
1 parent d1b1eb9
commit 7d215e4
Show file tree

Hide file tree

Showing 32 changed files with 415 additions and 408 deletions.
diff --git a/.azure-pipelines/steps/run-in-docker.yml b/.azure-pipelines/steps/run-in-docker.yml
@@ -21,8 +21,8 @@ steps:
         --build-arg DOTNETSDK_VERSION=$(dotnetCoreSdk5Version) \
         --tag dd-trace-dotnet/${{ parameters.baseImage }}-${{ parameters.target }} \
         --target ${{ parameters.target }} \
-        --file "$(System.DefaultWorkingDirectory)/build/_build/docker/${{ parameters.baseImage }}.dockerfile" \
-        "$(System.DefaultWorkingDirectory)/build/_build"
+        --file "$(System.DefaultWorkingDirectory)/tracer/build/_build/docker/${{ parameters.baseImage }}.dockerfile" \
+        "$(System.DefaultWorkingDirectory)/tracer/build/_build"
     displayName: Build ${{ parameters.baseImage }} Docker image
 - script: |
     docker run --rm \

diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,5 @@
-test/
-deploy/
+tracer/test/
+tracer/deploy/
 
 .circleci/
 .git/
@@ -10,5 +10,5 @@ packages/
 **/bin/
 **/obj/
 
-!test/test-applications/aspnet/Samples.AspNet472.LoaderOptimizationRegKey/bin/
-!src/WindowsInstaller/bin/
+!tracer/test/test-applications/aspnet/Samples.AspNet472.LoaderOptimizationRegKey/bin/
+!tracer/src/WindowsInstaller/bin/
diff --git a/.gitignore b/.gitignore
@@ -309,10 +309,6 @@ BenchmarkDotNet.Artifacts/
 # VSTest results
 *.trx
 
-deploy/linux/
-deploy/AzureAppServices/
-!build/artifacts
-
 # macOS temporal files
 *..DS_Store
 .DS_Store/*
@@ -321,11 +317,18 @@ deploy/AzureAppServices/
 # NServiceBus files
 .learningtransport
 
+## Tracer .gitignore settings
+# Tracer deployment artifacts
+tracer/deploy/linux/
+tracer/deploy/AzureAppServices/
+!tracer/build/artifacts
+
 # profiler build files
-src/Datadog.Trace.ClrProfiler.Native/build/
-src/Datadog.Trace.ClrProfiler.Native/deps/
-src/Datadog.Trace.ClrProfiler.Native/CMakeFiles/
-src/Datadog.Trace.ClrProfiler.Native/tmp.*
-src/Datadog.Trace.ClrProfiler.Native/Makefile
-src/Datadog.Trace.ClrProfiler.Native/CMakeCache.txt
-src/Datadog.Trace.ClrProfiler.Native/cmake_install.cmake
+tracer/src/Datadog.Trace.ClrProfiler.Native/build/
+tracer/src/Datadog.Trace.ClrProfiler.Native/deps/
+tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeFiles/
+tracer/src/Datadog.Trace.ClrProfiler.Native/tmp.*
+tracer/src/Datadog.Trace.ClrProfiler.Native/Makefile
+tracer/src/Datadog.Trace.ClrProfiler.Native/CMakeCache.txt
+tracer/src/Datadog.Trace.ClrProfiler.Native/cmake_install.cmake
+!tracer/src/Datadog.Trace.ClrProfiler.Native/lib/**
diff --git a/Datadog.Trace.Minimal.slnf b/Datadog.Trace.Minimal.slnf
@@ -2,12 +2,12 @@
   "solution": {
     "path": "Datadog.Trace.sln",
     "projects": [
-      "src\\Datadog.Trace.ClrProfiler.Managed.Loader\\Datadog.Trace.ClrProfiler.Managed.Loader.csproj",
-      "src\\Datadog.Trace.ClrProfiler.Native\\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj",
-      "src\\Datadog.Trace.ClrProfiler.Native\\Datadog.Trace.ClrProfiler.Native.vcxproj",
-      "src\\Datadog.Trace.MSBuild\\Datadog.Trace.MSBuild.csproj",
-      "src\\Datadog.Trace.Tools.Analyzers\\Datadog.Trace.Tools.Analyzers.csproj",
-      "src\\Datadog.Trace\\Datadog.Trace.csproj"
+      "tracer\\src\\Datadog.Trace.ClrProfiler.Managed.Loader\\Datadog.Trace.ClrProfiler.Managed.Loader.csproj",
+      "tracer\\src\\Datadog.Trace.ClrProfiler.Native\\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj",
+      "tracer\\src\\Datadog.Trace.ClrProfiler.Native\\Datadog.Trace.ClrProfiler.Native.vcxproj",
+      "tracer\\src\\Datadog.Trace.MSBuild\\Datadog.Trace.MSBuild.csproj",
+      "tracer\\src\\Datadog.Trace.Tools.Analyzers\\Datadog.Trace.Tools.Analyzers.csproj",
+      "tracer\\src\\Datadog.Trace\\Datadog.Trace.csproj"
     ]
   }
 }
diff --git a/Datadog.Trace.Native.sln b/Datadog.Trace.Native.sln
@@ -6,26 +6,26 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9E5F0022-0A5
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8CEC2042-F11C-49F5-A674-2355793B600A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native.Tests", "test\Datadog.Trace.ClrProfiler.Native.Tests\Datadog.Trace.ClrProfiler.Native.Tests.vcxproj", "{5728056A-51AA-4FF5-AD0C-E86E44E36102}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native.Tests", "tracer\test\Datadog.Trace.ClrProfiler.Native.Tests\Datadog.Trace.ClrProfiler.Native.Tests.vcxproj", "{5728056A-51AA-4FF5-AD0C-E86E44E36102}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6CE95C50-9533-4650-8F11-BCE30908DCDF} = {6CE95C50-9533-4650-8F11-BCE30908DCDF}
 		{901F02A8-8776-4D18-80C9-05C58262C1C7} = {901F02A8-8776-4D18-80C9-05C58262C1C7}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native", "src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.vcxproj", "{91B6272F-5780-4C94-8071-DBBA7B4F67F3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native", "tracer\src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.vcxproj", "{91B6272F-5780-4C94-8071-DBBA7B4F67F3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native.DLL", "src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj", "{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native.DLL", "tracer\src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj", "{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0686E907-996A-4D6D-A685-D9C0F932C405} = {0686E907-996A-4D6D-A685-D9C0F932C405}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample-libs", "sample-libs", "{B9AA20A4-0F9A-47FB-B3BE-A5BDEA42EFF0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibrary", "test\test-applications\integrations\dependency-libs\Samples.ExampleLibrary\Samples.ExampleLibrary.csproj", "{901F02A8-8776-4D18-80C9-05C58262C1C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibrary", "tracer\test\test-applications\integrations\dependency-libs\Samples.ExampleLibrary\Samples.ExampleLibrary.csproj", "{901F02A8-8776-4D18-80C9-05C58262C1C7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibraryTracer", "test\test-applications\integrations\dependency-libs\Samples.ExampleLibraryTracer\Samples.ExampleLibraryTracer.csproj", "{6CE95C50-9533-4650-8F11-BCE30908DCDF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibraryTracer", "tracer\test\test-applications\integrations\dependency-libs\Samples.ExampleLibraryTracer\Samples.ExampleLibraryTracer.csproj", "{6CE95C50-9533-4650-8F11-BCE30908DCDF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.ClrProfiler.Managed.Loader", "src\Datadog.Trace.ClrProfiler.Managed.Loader\Datadog.Trace.ClrProfiler.Managed.Loader.csproj", "{0686E907-996A-4D6D-A685-D9C0F932C405}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.ClrProfiler.Managed.Loader", "tracer\src\Datadog.Trace.ClrProfiler.Managed.Loader\Datadog.Trace.ClrProfiler.Managed.Loader.csproj", "{0686E907-996A-4D6D-A685-D9C0F932C405}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Datadog.Trace.Security.slnf b/Datadog.Trace.Security.slnf
@@ -2,20 +2,20 @@
   "solution": {
     "path": "Datadog.Trace.sln",
     "projects": [
-      "src\\Datadog.Trace.AspNet\\Datadog.Trace.AspNet.csproj",
-      "src\\Datadog.Trace.Ci.Shared\\Datadog.Trace.Ci.Shared.shproj",
-      "src\\Datadog.Trace.ClrProfiler.Managed.Loader\\Datadog.Trace.ClrProfiler.Managed.Loader.csproj",
-      "src\\Datadog.Trace.ClrProfiler.Native\\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj",
-      "src\\Datadog.Trace.ClrProfiler.Native\\Datadog.Trace.ClrProfiler.Native.vcxproj",
-      "src\\Datadog.Trace.MSBuild\\Datadog.Trace.MSBuild.csproj",
-      "src\\Datadog.Trace.Tools.Analyzers\\Datadog.Trace.Tools.Analyzers.csproj",
-      "src\\Datadog.Trace\\Datadog.Trace.csproj",
-      "test\\Datadog.Trace.ClrProfiler.IntegrationTests\\Datadog.Trace.ClrProfiler.IntegrationTests.csproj",
-      "test\\Datadog.Trace.Security.IntegrationTests\\Datadog.Trace.Security.IntegrationTests.csproj",
-      "test\\Datadog.Trace.TestHelpers\\Datadog.Trace.TestHelpers.csproj",
-      "test\\test-applications\\security\\Samples.AspNetCore2\\Samples.AspNetCore2.csproj",
-      "test\\test-applications\\security\\Samples.AspNetCore5\\Samples.AspNetCore5.csproj",
-      "test\\test-applications\\security\\aspnet\\Samples.AspNetMvc5\\Samples.AspNetMvc5.csproj"
+      "tracer\\src\\Datadog.Trace.AspNet\\Datadog.Trace.AspNet.csproj",
+      "tracer\\src\\Datadog.Trace.Ci.Shared\\Datadog.Trace.Ci.Shared.shproj",
+      "tracer\\src\\Datadog.Trace.ClrProfiler.Managed.Loader\\Datadog.Trace.ClrProfiler.Managed.Loader.csproj",
+      "tracer\\src\\Datadog.Trace.ClrProfiler.Native\\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj",
+      "tracer\\src\\Datadog.Trace.ClrProfiler.Native\\Datadog.Trace.ClrProfiler.Native.vcxproj",
+      "tracer\\src\\Datadog.Trace.MSBuild\\Datadog.Trace.MSBuild.csproj",
+      "tracer\\src\\Datadog.Trace.Tools.Analyzers\\Datadog.Trace.Tools.Analyzers.csproj",
+      "tracer\\src\\Datadog.Trace\\Datadog.Trace.csproj",
+      "tracer\\test\\Datadog.Trace.ClrProfiler.IntegrationTests\\Datadog.Trace.ClrProfiler.IntegrationTests.csproj",
+      "tracer\\test\\Datadog.Trace.Security.IntegrationTests\\Datadog.Trace.Security.IntegrationTests.csproj",
+      "tracer\\test\\Datadog.Trace.TestHelpers\\Datadog.Trace.TestHelpers.csproj",
+      "tracer\\test\\test-applications\\security\\Samples.AspNetCore2\\Samples.AspNetCore2.csproj",
+      "tracer\\test\\test-applications\\security\\Samples.AspNetCore5\\Samples.AspNetCore5.csproj",
+      "tracer\\test\\test-applications\\security\\aspnet\\Samples.AspNetMvc5\\Samples.AspNetMvc5.csproj"
     ]
   }
 }