Move submodules along with projects, patches, and keys into single src dir #484
Conversation
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
mthalman
reviewed
May 7, 2025
Directory.Build.props
Outdated
Comment on lines
14
to
16
| <KeysDir>$(ProjectDir)src/repos/keys/</KeysDir> | ||
| <SubmoduleDirectory>$(ProjectDir)src/repos/src/</SubmoduleDirectory> | ||
| <PatchesDir>$(ProjectDir)src/repos/patches/</PatchesDir> |
There was a problem hiding this comment.
What logic is dependent on this? I'm thinking these definitions should be relocated to a Directory.Build.props file in src/repos.
There was a problem hiding this comment.
Fixed with d703753.
5b3d4f1 to
439cc52
Compare
439cc52 to
d703753
Compare
MichaelSimons
commented
May 7, 2025
| @@ -31,7 +35,6 @@ | |||
| <!-- _InitializeDotNetCli is used by websdk and templating to decide whether to init the SDK --> | |||
| <EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetRoot)" /> | |||
| <EnvironmentVariables Include="_DotNetInstallDir=$(DotNetRoot)" /> | |||
| <EnvironmentVariables Include="_InitializeToolset=$(ProjectDir)Tools/source-built/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj" Condition="'$(UseBootstrapArcade)' != 'true'" /> | |||
There was a problem hiding this comment.
This is obviously out of date and not in use so I removed it since I would like to remove the ProjectDir property.
MichaelSimons
commented
May 7, 2025
| @@ -6,6 +6,10 @@ | |||
| <TargetFramework>$(NetCurrent)</TargetFramework> | |||
| <RepositoryName>$(MSBuildProjectName)</RepositoryName> | |||
|
|
|||
| <SrcReposDir>$(SrcDir)repos/</SrcReposDir> | |||
| <KeysDir>$(SrcReposDir)keys/</KeysDir> | |||
| <SubmoduleDirectory>$(SrcReposDir)src/</SubmoduleDirectory> | |||
There was a problem hiding this comment.
There is an opportunity to make the names more consistent - e.g. Dir vs Directory. This would expand the scope beyond the core intent.
mthalman
approved these changes
May 7, 2025
akoeplinger
added a commit
that referenced
this pull request
May 8, 2025
#484 moved the repos but the CredScanSuppressions.json wasn't updated.
akoeplinger
added a commit
that referenced
this pull request
May 8, 2025
#484 moved the repos but the CredScanSuppressions.json wasn't updated.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Related to dotnet/source-build#5142
This is directory refactoring is to support migrating the text-only packages from SBRP to SBE. These changes are aiming to consolidate the files/directories to support submodule repos versus the soon to come text-only packages.
Original Directory Structure:
New Directory Structure: