Skip to content

Switch to new VMR control set #17703

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

Merged
merged 12 commits into from
Sep 16, 2024
Merged

Switch to new VMR control set #17703

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5ac523e
Now that fsharp is on 9.0, we can switch to the new control set. Gene…
mmitche Sep 11, 2024
abc01df
Split out source build args
mmitche Sep 12, 2024
cab0be1
Merge remote-tracking branch 'upstream/main' into new-controls
mmitche Sep 12, 2024
a5d032b
Split out source build args
mmitche Sep 12, 2024
027c2a0
Remove unnecessary source build env var set
mmitche Sep 13, 2024
06bf5c7
Add properties to the bootstrap compiler build
mmitche Sep 13, 2024
fda7889
BuildRepo -> BuildInnerRepo
mmitche Sep 13, 2024
7fd4569
Only build proto repo in inner build
mmitche Sep 13, 2024
fbc9ef2
Additional VMR properties for completeness
mmitche Sep 13, 2024
901aa9b
Merge branch 'main' into new-controls
psfinaki Sep 16, 2024
41bda43
Rename sourcebuild.props -> dotnetbuild.props
mmitche Sep 16, 2024
0faffec
Merge remote-tracking branch 'origin/new-controls' into new-controls
mmitche Sep 16, 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
Prev Previous commit
Next Next commit
Only build proto repo in inner build
  • Loading branch information
@mmitche
mmitche committed Sep 13, 2024
commit 7fd456927aa01664a0effe5103e6c84dd91fe194
6 changes: 4 additions & 2 deletions proto.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
<RootDir Condition="'$(RootDir)'==''">Bootstrap</RootDir>
</PropertyGroup>

<!-- Skip on source only builds. -->
<ItemGroup Condition="'$(DotNetBuildSourceOnly)'!='true'">
<!-- This needs to be built only in the inner VMR build proto invocation, but not the outer VMR build invocation.
The project does not import Arcade targets so we only have the properties that were passed in, rather than
calculated properties like DotNetBuildPhase. -->
<ItemGroup Condition="'$(DotNetBuildSourceOnly)'!='true' or '$(DotNetBuildInnerRepo)' == 'true'">
<Projects Include="buildtools\fslex\fslex.fsproj" />
<Projects Include="buildtools\fsyacc\fsyacc.fsproj" />
<Projects Include="buildtools\AssemblyCheck\AssemblyCheck.fsproj" />
Expand Down
Loading