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

Isolate package flow between repos #18557

Merged
merged 44 commits into from
Feb 22, 2024
Merged

Isolate package flow between repos #18557

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0ea4e6c
Isolate package flow between repos
mthalman Feb 6, 2024
3878626
Compute transitive dependencies
mthalman Feb 12, 2024
823a8aa
Swap dep graph visualizer with a simple YAML-based representation
mthalman Feb 12, 2024
edebea7
Fix dependency on scenario-tests
mthalman Feb 12, 2024
5b8a5a2
Remove duplicate installer dependency
mthalman Feb 12, 2024
566f613
Delete obsolete installer-deps
mthalman Feb 12, 2024
8ce569e
Add conditional deps specific to source build
mthalman Feb 13, 2024
4611a5e
Merge branch 'main' into sb3608-parallel
mthalman Feb 13, 2024
fe61fb5
Merge branch 'main' into sb3608-parallel
mthalman Feb 16, 2024
d18498a
Updates to integrate with artifact path refactoring
mthalman Feb 16, 2024
6f33ebb
Merge branch 'main' into sb3608-parallel
mthalman Feb 20, 2024
608e3ad
Add back primary dependencies
mthalman Feb 21, 2024
a7a6f79
Move psb references
mthalman Feb 21, 2024
bdaa440
Use Exclude instead of Condition
mthalman Feb 21, 2024
241ad6f
whitespace
mthalman Feb 21, 2024
a50512d
Remove MakeDir for package dirs
mthalman Feb 21, 2024
c97b8d2
Add comment for embedding
mthalman Feb 21, 2024
8b3f3b2
indenting
mthalman Feb 21, 2024
8834743
Remove TransitiveRepositoryReference instead of RepositoryReference, …
mthalman Feb 21, 2024
0540025
Remove SkipEnsurePackagesCreated
mthalman Feb 21, 2024
3c0edf6
Remove SharedOutputPath MakeDir
mthalman Feb 21, 2024
fe82c36
Use Copy instead of ln
mthalman Feb 21, 2024
816e8dc
Separate SB refs into separate ItemGroup
mthalman Feb 21, 2024
4d7ac80
dependency adjustments
mthalman Feb 21, 2024
2be9e44
Renames to remove "SourceBuild"
mthalman Feb 21, 2024
a0117ac
Reclassify fsharp dep on runtime
mthalman Feb 22, 2024
afb34ea
Reclassify msbuild dep on runtime
mthalman Feb 22, 2024
bb5af84
Add runtime dep to templating
mthalman Feb 22, 2024
fe469d7
Remove whitespace
mthalman Feb 22, 2024
308159f
Remove psb dep on scenario-tests
mthalman Feb 22, 2024
19bc3f3
Remove whitespace
mthalman Feb 22, 2024
5f14aa3
Reclassify format dep on symreader
mthalman Feb 22, 2024
80ba493
Use directory normalization
mthalman Feb 22, 2024
7d574e2
Simplify package file collection
mthalman Feb 22, 2024
a0599e1
Add whitespace
mthalman Feb 22, 2024
6e800d7
Simplify _BuildSources
mthalman Feb 22, 2024
59013c6
Get repo refs in parallel
mthalman Feb 22, 2024
28f645a
Use Distinct
mthalman Feb 22, 2024
0dfac72
whitespace
mthalman Feb 22, 2024
d1b1de0
Merge branch 'main' into sb3608-parallel
mthalman Feb 22, 2024
2c3836b
Move windowsdesktop dep from sdk to installer
mthalman Feb 22, 2024
9a25ae6
Revert "Use Distinct"
mthalman Feb 22, 2024
5420993
Remove unnecessary normalize calls
mthalman Feb 22, 2024
2303610
Update src/SourceBuild/content/repo-projects/package-source-build.proj
mthalman Feb 22, 2024
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
9 changes: 4 additions & 5 deletions src/SourceBuild/content/repo-projects/package-source-build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,20 @@
<!-- Create a layout directory for the files that are to be included in the artifacts tarball. Since there are a large number of files, this will use symlinks
instead of copying files to make this execute quickly. -->
<PropertyGroup>
<_SourceBuiltLayoutDir>$(BaseIntermediateOutputPath)artifacts-layout/</_SourceBuiltLayoutDir>
<_SourceBuiltLayoutDir>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', 'artifacts-layout'))</_SourceBuiltLayoutDir>
<SourceBuildReferencePackagesDestinationDirName>SourceBuildReferencePackages</SourceBuildReferencePackagesDestinationDirName>
</PropertyGroup>
mthalman marked this conversation as resolved.
Show resolved Hide resolved
<MakeDir Directories="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)" />
<Copy SourceFiles="@(_AllRepoFiles)"
DestinationFolder="$(_SourceBuiltLayoutDir)"
UseSymbolicLinksIfPossible="true" />
<Copy SourceFiles="$(BaseIntermediateOutputPath)$(SourceBuiltVersionFileName)"
<Copy SourceFiles="$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(SourceBuiltVersionFileName)'))"
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
DestinationFolder="$(_SourceBuiltLayoutDir)"
UseSymbolicLinksIfPossible="true" />
<Copy SourceFiles="$(CurrentSourceBuiltPackageVersionPropsPath)"
DestinationFiles="$(_SourceBuiltLayoutDir)PackageVersions.props"
DestinationFiles="$([MSBuild]::NormalizeDirectory('$(_SourceBuiltLayoutDir)', 'PackageVersions.props'))"
UseSymbolicLinksIfPossible="true" />
<Copy SourceFiles="@(_ReferencePackageFiles)"
DestinationFolder="$(_SourceBuiltLayoutDir)$(SourceBuildReferencePackagesDestinationDirName)"
DestinationFolder="$([MSBuild]::NormalizeDirectory('$(_SourceBuiltLayoutDir)', '$(SourceBuildReferencePackagesDestinationDirName)'))"
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
UseSymbolicLinksIfPossible="true" />

<Exec Command="tar --numeric-owner -czhf $(SourceBuiltTarballName) $(SourceBuiltVersionFileName) *"
Expand Down