File tree 12 files changed +15
-15
lines changed
12 files changed +15
-15
lines changed Original file line number Diff line number Diff line change 28
28
<!-- When building in source-only modes, let the TFM float based on what arcade is in use.
29
29
When building in normal modes (independent build or a dotnet product build), set explicitly. -->
30
30
<LatestDotNetCoreForMSBuild >net9.0</LatestDotNetCoreForMSBuild >
31
- <LatestDotNetCoreForMSBuild Condition =" '$(DotNetBuildFromSource)' == 'true' or '$( DotNetBuildSourceOnly)' == 'true'" >$(NetCurrent)</LatestDotNetCoreForMSBuild >
31
+ <LatestDotNetCoreForMSBuild Condition =" '$(DotNetBuildSourceOnly)' == 'true'" >$(NetCurrent)</LatestDotNetCoreForMSBuild >
32
32
</PropertyGroup >
33
33
34
34
<PropertyGroup >
Original file line number Diff line number Diff line change 2
2
3
3
<PropertyGroup >
4
4
<!-- 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 >
6
6
</PropertyGroup >
7
7
8
8
<ItemGroup >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<Target Name =" ConfigureInnerBuildArgs" BeforeTargets =" GetSourceBuildCommandConfiguration"
11
- Condition =" '$(ArcadeBuildFromSource)' == 'true' or '$( DotNetBuildSourceOnly)' == 'true'" >
11
+ Condition =" '$(DotNetBuildSourceOnly)' == 'true'" >
12
12
<PropertyGroup >
13
13
<!-- Filter down projects aggressively in source-only modes. -->
14
14
<InnerBuildArgs >$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)MSBuild.SourceBuild.slnf"</InnerBuildArgs >
Original file line number Diff line number Diff line change 62
62
<PackageVersion Update =" Verify.XUnit" Condition =" '$(VerifyXUnitVersion)' != ''" Version =" $(VerifyXUnitVersion)" />
63
63
</ItemGroup >
64
64
65
- <ItemGroup Condition =" '$(DotNetBuildFromSource )' != 'true' AND $(ProjectIsDeprecated) != 'true'" >
65
+ <ItemGroup Condition =" '$(DotNetBuildSourceOnly )' != 'true' AND $(ProjectIsDeprecated) != 'true'" >
66
66
<GlobalPackageReference Include =" Microsoft.CodeAnalysis.BannedApiAnalyzers" Version =" 3.3.4" />
67
67
<GlobalPackageReference Include =" StyleCop.Analyzers" Version =" 1.2.0-beta.507" PrivateAssets =" all" />
68
68
<GlobalPackageReference Include =" Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version =" 15.0.36" PrivateAssets =" All" Condition =" '$(TargetFrameworkIdentifier)' == '.NETFramework'" />
Original file line number Diff line number Diff line change 39
39
<PackageReference Include =" Microsoft.BuildXL.Processes" Condition =" '$(FeatureReportFileAccesses)' == 'true'" PrivateAssets =" all" />
40
40
</ItemGroup >
41
41
42
- <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource )' != 'true'" >
42
+ <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildSourceOnly )' != 'true'" >
43
43
<PackageReference Include =" Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets =" all" />
44
44
</ItemGroup >
45
45
<ItemGroup Condition =" '$(TargetFrameworkIdentifier)' == '.NETFramework'" >
Original file line number Diff line number Diff line change 68
68
<FeatureXamlTypes >true</FeatureXamlTypes >
69
69
<DefineConstants >$(DefineConstants);FEATURE_XML_SCHEMA_VALIDATION</DefineConstants >
70
70
<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 >
72
72
<DefineConstants >$(DefineConstants);FEATURE_MSCOREE</DefineConstants >
73
73
</PropertyGroup >
74
74
110
110
<DocumentationFile Condition =" '$(GenerateDocumentationFile)' == 'true' " >$(IntermediateOutputPath)\$(AssemblyName).xml</DocumentationFile >
111
111
</PropertyGroup >
112
112
113
- <PropertyGroup Condition =" '$(DotNetBuildFromSource )' != 'true' and $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'" >
113
+ <PropertyGroup Condition =" '$(DotNetBuildSourceOnly )' != 'true' and $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'" >
114
114
<DefineConstants >$(DefineConstants);FEATURE_MSIOREDIST</DefineConstants >
115
115
<FeatureMSIORedist >true</FeatureMSIORedist >
116
116
</PropertyGroup >
Original file line number Diff line number Diff line change 31
31
32
32
<!-- Defaults for target frameworks and architecture -->
33
33
<LibraryTargetFrameworks >$(FullFrameworkTFM);$(LatestDotNetCoreForMSBuild);netstandard2.0</LibraryTargetFrameworks >
34
- <LibraryTargetFrameworks Condition =" '$(DotNetBuildFromSource )' == 'true'" >$(LatestDotNetCoreForMSBuild);netstandard2.0</LibraryTargetFrameworks >
34
+ <LibraryTargetFrameworks Condition =" '$(DotNetBuildSourceOnly )' == 'true'" >$(LatestDotNetCoreForMSBuild);netstandard2.0</LibraryTargetFrameworks >
35
35
<PlatformTarget >AnyCPU</PlatformTarget >
36
36
37
37
<!-- Target frameworks for Exe and unit test projects (ie projects with runtime output) -->
Original file line number Diff line number Diff line change 17
17
<!-- Set RuntimeIdentifiers so that NuGet will restore for both AnyCPU as well as x86 and x64.
18
18
This is important for the MSBuild.VSSetup project, which "references" both the x86 and x64
19
19
versions of this project -->
20
- <RuntimeIdentifiers Condition =" '$(DotNetBuildFromSource )' != 'true'" >win7-x86;win7-x64</RuntimeIdentifiers >
20
+ <RuntimeIdentifiers Condition =" '$(DotNetBuildSourceOnly )' != 'true'" >win7-x86;win7-x64</RuntimeIdentifiers >
21
21
<UseRidGraph >true</UseRidGraph >
22
22
23
23
<EnableDefaultItems >false</EnableDefaultItems >
191
191
<Reference Include =" System.Xml" />
192
192
<PackageReference Include =" LargeAddressAware" PrivateAssets =" All" />
193
193
</ItemGroup >
194
- <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' != '.NETFramework' AND '$(DotNetBuildFromSource )' != 'true'" >
194
+ <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' != '.NETFramework' AND '$(DotNetBuildSourceOnly )' != 'true'" >
195
195
<!-- Bump these to the latest version despite transitive references to older -->
196
196
<PackageReference Include =" System.Private.Uri" PrivateAssets =" all" />
197
197
</ItemGroup >
Original file line number Diff line number Diff line change 13
13
<!-- Set RuntimeIdentifiers so that NuGet will restore for both AnyCPU as well as x86 and x64.
14
14
This is important for the MSBuild.VSSetup project, which "references" both the x86 and x64
15
15
versions of this project -->
16
- <RuntimeIdentifiers Condition =" '$(DotNetBuildFromSource )' != 'true'" >win7-x86;win7-x64</RuntimeIdentifiers >
16
+ <RuntimeIdentifiers Condition =" '$(DotNetBuildSourceOnly )' != 'true'" >win7-x86;win7-x64</RuntimeIdentifiers >
17
17
<UseRidGraph >true</UseRidGraph >
18
18
19
19
<EnableDefaultItems >false</EnableDefaultItems >
Original file line number Diff line number Diff line change 16
16
<PackageReference Include =" BenchmarkDotNet" />
17
17
</ItemGroup >
18
18
19
- <ItemGroup Condition =" '$(DotNetBuildFromSource )' != 'true'" >
19
+ <ItemGroup Condition =" '$(DotNetBuildSourceOnly )' != 'true'" >
20
20
<!-- Bump these to the latest version despite transitive references to older -->
21
21
<PackageReference Include =" System.Private.Uri" />
22
22
<PackageReference Include =" System.Runtime" />
Original file line number Diff line number Diff line change 684
684
<PackageReference Include =" System.Threading.Tasks.Dataflow" />
685
685
</ItemGroup >
686
686
687
- <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource )' != 'true'" >
687
+ <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildSourceOnly )' != 'true'" >
688
688
<PackageReference Include =" Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets =" all" />
689
689
</ItemGroup >
690
690
<ItemGroup Condition =" '$(TargetFrameworkIdentifier)' == '.NETFramework'" >
Original file line number Diff line number Diff line change 27
27
<PackageReference Include =" System.Configuration.ConfigurationManager" />
28
28
</ItemGroup >
29
29
30
- <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' != '.NETStandard' and '$(DotNetBuildFromSource )' != 'true'" >
30
+ <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' != '.NETStandard' and '$(DotNetBuildSourceOnly )' != 'true'" >
31
31
<PackageReference Include =" Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets =" all" />
32
32
</ItemGroup >
33
33
34
34
<ItemGroup Condition =" '$(TargetFrameworkIdentifier)' == '.NETStandard'" >
35
35
<PackageReference Include =" System.Text.Encoding.CodePages" />
36
36
</ItemGroup >
37
-
37
+
38
38
<ItemGroup Label =" Shared Code" >
39
39
<Compile Include =" ..\Shared\AssemblyFolders\AssemblyFoldersEx.cs" >
40
40
<Link >Shared\AssemblyFolders\AssemblyFoldersEx.cs</Link >
You can’t perform that action at this time.
0 commit comments