Skip to content

Commit faadade

Browse files
authored
Move to new VMR control set (#10661)
* Move to new VMR control set Now that msbuild is on 9.0 arcade, we can switch to the new control set. Generally: - DotNetBuildFromSource -> DotNetBuildSourceOnly - Building a source-only build. - DotnetBuildFromSourceFlavor == Product -> DotNetBuildOrchestrator == true - Building in the VMR, could be source-only or MS's build. - ArcadeBuildFromSource -> DotNetBuildRepo == true -> Indicates an outer repo build. * Rename sourcebuild.props -> dotnetbuild.props
1 parent aeabd8b commit faadade

12 files changed

+15
-15
lines changed

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- When building in source-only modes, let the TFM float based on what arcade is in use.
2929
When building in normal modes (independent build or a dotnet product build), set explicitly. -->
3030
<LatestDotNetCoreForMSBuild>net9.0</LatestDotNetCoreForMSBuild>
31-
<LatestDotNetCoreForMSBuild Condition="'$(DotNetBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</LatestDotNetCoreForMSBuild>
31+
<LatestDotNetCoreForMSBuild Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</LatestDotNetCoreForMSBuild>
3232
</PropertyGroup>
3333

3434
<PropertyGroup>

eng/Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- Static graph restores projects from the parent sln file that are excluded by the slnf file: https://github.com/NuGet/Home/issues/13097. -->
5-
<RestoreUseStaticGraphEvaluation Condition="'$(DotNetBuildFromSource)' != 'true'">true</RestoreUseStaticGraphEvaluation>
5+
<RestoreUseStaticGraphEvaluation Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</RestoreUseStaticGraphEvaluation>
66
</PropertyGroup>
77

88
<ItemGroup>

eng/SourceBuild.props renamed to eng/DotNetBuild.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<Target Name="ConfigureInnerBuildArgs" BeforeTargets="GetSourceBuildCommandConfiguration"
11-
Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">
11+
Condition="'$(DotNetBuildSourceOnly)' == 'true'">
1212
<PropertyGroup>
1313
<!-- Filter down projects aggressively in source-only modes. -->
1414
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)MSBuild.SourceBuild.slnf"</InnerBuildArgs>

eng/dependabot/Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
6363
</ItemGroup>
6464

65-
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true' AND $(ProjectIsDeprecated) != 'true'">
65+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' AND $(ProjectIsDeprecated) != 'true'">
6666
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
6767
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all"/>
6868
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />

src/Build/Microsoft.Build.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageReference Include="Microsoft.BuildXL.Processes" Condition="'$(FeatureReportFileAccesses)' == 'true'" PrivateAssets="all" />
4040
</ItemGroup>
4141

42-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource)' != 'true'">
42+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildSourceOnly)' != 'true'">
4343
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="all" />
4444
</ItemGroup>
4545
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

src/Directory.BeforeCommon.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<FeatureXamlTypes>true</FeatureXamlTypes>
6969
<DefineConstants>$(DefineConstants);FEATURE_XML_SCHEMA_VALIDATION</DefineConstants>
7070
<DefineConstants Condition="'$(MachineIndependentBuild)' != 'true'">$(DefineConstants);FEATURE_WIN32_REGISTRY</DefineConstants>
71-
<DefineConstants Condition="'$(MachineIndependentBuild)' != 'true' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(DotNetBuildFromSource)' != 'true'">$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
71+
<DefineConstants Condition="'$(MachineIndependentBuild)' != 'true' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(DotNetBuildSourceOnly)' != 'true'">$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
7272
<DefineConstants>$(DefineConstants);FEATURE_MSCOREE</DefineConstants>
7373
</PropertyGroup>
7474

@@ -110,7 +110,7 @@
110110
<DocumentationFile Condition=" '$(GenerateDocumentationFile)' == 'true' ">$(IntermediateOutputPath)\$(AssemblyName).xml</DocumentationFile>
111111
</PropertyGroup>
112112

113-
<PropertyGroup Condition="'$(DotNetBuildFromSource)' != 'true' and $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">
113+
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">
114114
<DefineConstants>$(DefineConstants);FEATURE_MSIOREDIST</DefineConstants>
115115
<FeatureMSIORedist>true</FeatureMSIORedist>
116116
</PropertyGroup>

src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<!-- Defaults for target frameworks and architecture -->
3333
<LibraryTargetFrameworks>$(FullFrameworkTFM);$(LatestDotNetCoreForMSBuild);netstandard2.0</LibraryTargetFrameworks>
34-
<LibraryTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(LatestDotNetCoreForMSBuild);netstandard2.0</LibraryTargetFrameworks>
34+
<LibraryTargetFrameworks Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(LatestDotNetCoreForMSBuild);netstandard2.0</LibraryTargetFrameworks>
3535
<PlatformTarget>AnyCPU</PlatformTarget>
3636

3737
<!-- Target frameworks for Exe and unit test projects (ie projects with runtime output) -->

src/MSBuild/MSBuild.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!-- Set RuntimeIdentifiers so that NuGet will restore for both AnyCPU as well as x86 and x64.
1818
This is important for the MSBuild.VSSetup project, which "references" both the x86 and x64
1919
versions of this project -->
20-
<RuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' != 'true'">win7-x86;win7-x64</RuntimeIdentifiers>
20+
<RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">win7-x86;win7-x64</RuntimeIdentifiers>
2121
<UseRidGraph>true</UseRidGraph>
2222

2323
<EnableDefaultItems>false</EnableDefaultItems>
@@ -191,7 +191,7 @@
191191
<Reference Include="System.Xml" />
192192
<PackageReference Include="LargeAddressAware" PrivateAssets="All" />
193193
</ItemGroup>
194-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework' AND '$(DotNetBuildFromSource)' != 'true'">
194+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework' AND '$(DotNetBuildSourceOnly)' != 'true'">
195195
<!-- Bump these to the latest version despite transitive references to older -->
196196
<PackageReference Include="System.Private.Uri" PrivateAssets="all" />
197197
</ItemGroup>

src/MSBuildTaskHost/MSBuildTaskHost.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<!-- Set RuntimeIdentifiers so that NuGet will restore for both AnyCPU as well as x86 and x64.
1414
This is important for the MSBuild.VSSetup project, which "references" both the x86 and x64
1515
versions of this project -->
16-
<RuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' != 'true'">win7-x86;win7-x64</RuntimeIdentifiers>
16+
<RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">win7-x86;win7-x64</RuntimeIdentifiers>
1717
<UseRidGraph>true</UseRidGraph>
1818

1919
<EnableDefaultItems>false</EnableDefaultItems>

src/StringTools.Benchmark/StringTools.Benchmark.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="BenchmarkDotNet" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
19+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
2020
<!-- Bump these to the latest version despite transitive references to older -->
2121
<PackageReference Include="System.Private.Uri" />
2222
<PackageReference Include="System.Runtime" />

src/Tasks/Microsoft.Build.Tasks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@
684684
<PackageReference Include="System.Threading.Tasks.Dataflow" />
685685
</ItemGroup>
686686

687-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource)' != 'true'">
687+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildSourceOnly)' != 'true'">
688688
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="all" />
689689
</ItemGroup>
690690
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

src/Utilities/Microsoft.Build.Utilities.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
<PackageReference Include="System.Configuration.ConfigurationManager" />
2828
</ItemGroup>
2929

30-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard' and '$(DotNetBuildFromSource)' != 'true'">
30+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard' and '$(DotNetBuildSourceOnly)' != 'true'">
3131
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="all" />
3232
</ItemGroup>
3333

3434
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
3535
<PackageReference Include="System.Text.Encoding.CodePages" />
3636
</ItemGroup>
37-
37+
3838
<ItemGroup Label="Shared Code">
3939
<Compile Include="..\Shared\AssemblyFolders\AssemblyFoldersEx.cs">
4040
<Link>Shared\AssemblyFolders\AssemblyFoldersEx.cs</Link>

0 commit comments

Comments
 (0)