Directory Restructuring#973
Merged
Merged
Conversation
ff72fa9 to
e1a0890
Compare
229446d to
1ea5821
Compare
Contributor
Author
|
I'm not sure what's up with the Azure DevOps but it looks like the integration-tests are largely succeeding after the latest commit 1ea5821 , though they're getting close to timing out for taking too long: https://dev.azure.com/datadoghq/dd-trace-dotnet/_build/results?buildId=27411&view=results |
- Move docker to build/docker - Update docker-compose.yml to accommodate new file path - Update shell script files to accommodate new file path - Modify .gitignore to allow the build/artifacts directory to be checked in - Move createLogPath.sh and Datadog logos to build/artifacts - Modify package.sh to consume createLogPath.sh from the new location - Move tools/PrepareRelease and tools/GeneratePackageVersions to build/tools - Copy tools/Directory.Build.props and tools/GlobalSuppression.cs to build/tools with some modifications - Modify PrepareRelease files to accommodate new file path - Modify GeneratePackageVersion files to accommodate new file path - Modify Datadog.Trace.proj to accommodate new file path
1ea5821 to
f84e4a4
Compare
lucaspimentel
approved these changes
Oct 19, 2020
colin-higgins
approved these changes
Oct 19, 2020
- Move samples to test/test-applications/integrations - Move sample-libs to test/test-applications/integrations/dependency-libs - Move reproductions to test/test-applications/regression - Move reproduction-dependencies to test/test-applications/regression/dependency-libs - Move samples-aspnet to test/test-applications/aspnet - Move samples-iis folder to test/test-applications/aspnet - Modify project files to build - Modify IntegrationTests to run tests from the new directories
- Move benchmarks and performance to test/benchmarks - Modify project files to build - Comment out the Save method call in Performance.StackExchange.Redis so the BenchmarkDotNet artifacts would be produced in the expected location - Modify benchmarks.yml to run benchmarks from the new location
- Move lib/coreclr/src to src/Datadog.Trace.ClrProfiler.Native/lib/coreclr/src - Modify Profiler build scripts to find new CoreCLR lib path
f86eb59 to
992256f
Compare
- Move deploy/Datadog.Trace.ClrProfiler.WindowsInstaller to src/Datadog.Trace.ClrProfiler.WindowsInstaller
- Move customer-samples directory to samples - Rename customer-samples.sln to samples.sln
…ndowsInstaller (and rename the .wixproj file as well)
- Delete unnecessary files that would otherwise bubble up to test/test-applications/integrations/dependency-libs/Directory.Build.props - Move Test.Common.props to test/test-applications/Directory.Build.props, and modify solution file and imports accordingly - Add a new Directory.Build.props in the build directory so there's a chain of them - Modify all StyleCop Include declarations to use $(MSBuildThisFileDirectory) since relative paths in ItemGroups are evaluated from the original project file location
992256f to
0ce3823
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Goal
Implements the proposal discussed in #951. There is a significant amount of changes marked with
File renamed without changes.. I recommend viewing the changes commit by commit as they each set up a subdirectory as outlined in the proposal. I may even merge this change as separate commits instead of squashing.High-Level Changes
buildsubdirectorytest/test-applicationssubdirectorysamples->test/test-applications/integrationssample-libs->test/test-applications/integrations/dependency-libsreproductions->test/test-applications/regressionreproduction-dependencies->test/test-applications/regression/dependency-libssamples-aspnet->test/test-applications/aspnetsamples-iis->test/test-applications/aspnetbenchmarkstotest/benchmarksperformancedirectorylibtosrc/Datadog.Trace.ClrProfiler.Native/libdeploy/Datadog.Trace.ClrProfiler.WindowsInstallertosrc/WindowsInstallercustomer-samplestosamplesResult
Datadog.Trace.sln
Validation
@DataDog/apm-dotnet