|
36 | 36 | <IsPrerelease>true</IsPrerelease>
|
37 | 37 | </PropertyGroup>
|
38 | 38 |
|
| 39 | + <!-- Provides package dependency version properties and verification/auto-upgrade configuration --> |
| 40 | + <Import Project="$(MSBuildThisFileDirectory)dependencies.props" /> |
| 41 | + |
| 42 | + <Import Project="$(ProjectDir)artifacts\toolset\Common\Tools.proj.nuget.g.props" Condition="Exists('$(ProjectDir)artifacts\toolset\Common\Tools.proj.nuget.g.props')" /> |
| 43 | + |
39 | 44 | <!-- Common repo directories -->
|
40 | 45 | <PropertyGroup>
|
41 | 46 | <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
|
|
46 | 51 |
|
47 | 52 | <!-- Output directories -->
|
48 | 53 | <BinDir Condition="'$(BinDir)'==''">$(ProjectDir)bin/</BinDir>
|
49 |
| - |
| 54 | + <RootIntermediateOutputPath>$(MSBuildThisFileDirectory)bin/obj/</RootIntermediateOutputPath> |
| 55 | + |
50 | 56 | <TestWorkingDir Condition="'$(TestWorkingDir)'==''">$(BinDir)tests/</TestWorkingDir>
|
51 | 57 | <PackageOutputRoot Condition="'$(PackageOutputRoot)'=='' and '$(NonShippingPackage)' == 'true'">$(BinDir)packages_noship/</PackageOutputRoot>
|
52 | 58 | <PackageOutputRoot Condition="'$(PackageOutputRoot)'==''">$(BinDir)packages/</PackageOutputRoot>
|
53 | 59 |
|
54 | 60 | <!-- Input Directories -->
|
55 | 61 | <PackagesDir>$(DotNetRestorePackagesPath)</PackagesDir>
|
| 62 | + <PackagesDir Condition="'$(PackagesDir)'==''">$(NuGetPackageRoot)/</PackagesDir> |
56 | 63 | <PackagesDir Condition="'$(PackagesDir)'==''">$(ProjectDir)packages/</PackagesDir>
|
57 | 64 | <RestorePackagesPath Condition="'$(RestorePackagesPath)'==''">$(PackagesDir)</RestorePackagesPath>
|
58 |
| - <NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(PackagesDir)</NuGetPackageRoot> |
59 | 65 | <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir>
|
60 | 66 | <IlasmToolPath>$(ToolsDir)ilasm/ilasm</IlasmToolPath>
|
61 | 67 | <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleset>
|
62 |
| - |
63 |
| - <!-- Set up ToolHostCmd for Arcade targets --> |
64 |
| - <ToolHostCmd Condition="'$(ToolHostCmd)'==''">"$(ToolsDir)dotnetcli/dotnet"</ToolHostCmd> |
| 68 | + <!-- Respect environment variable for the .NET install directory if set; otherwise, use the current default location --> |
| 69 | + <DotNetRoot Condition="'$(DotNetRoot)' == ''">$(DOTNET_INSTALL_DIR)</DotNetRoot> |
| 70 | + <DotNetRoot Condition="'$(DotNetRoot)' == ''">$(ProjectDir).dotnet\</DotNetRoot> |
| 71 | + <DotNetRoot Condition="!HasTrailingSlash('$(DotNetRoot)')">$(DotNetRoot)\</DotNetRoot> |
| 72 | + <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(DotNetRoot)</DotnetCliPath> |
| 73 | + <ToolHostCmd Condition="'$(ToolHostCmd)'==''">"$(DotNetRoot)dotnet"</ToolHostCmd> |
65 | 74 | </PropertyGroup>
|
66 |
| - |
67 | 75 | <!-- Choose .targets files that come from Arcade rather than from buildtools -->
|
68 | 76 | <PropertyGroup>
|
69 | 77 | <ExcludeNotSupportedImport>true</ExcludeNotSupportedImport>
|
|
80 | 88 | </PropertyGroup>
|
81 | 89 |
|
82 | 90 | <!-- Default properties for CI builds -->
|
83 |
| - <!-- TODO: Remove obsolete condition when moved to arcade. --> |
84 |
| - <PropertyGroup Condition="'$(IsCIBuild)' == 'true' OR '$(ContinuousIntegrationBuild)' == 'true'"> |
| 91 | + <PropertyGroup Condition="'$(IsTestProject)' == 'true' and '$(ContinuousIntegrationBuild)' == 'true' and '$(OfficialBuildId)' == ''"> |
85 | 92 | <WithoutCategories>IgnoreForCI</WithoutCategories>
|
86 | 93 | <EnableDumpling>true</EnableDumpling>
|
87 | 94 | <CrashDumpFolder Condition="'$(RunningOnUnix)' != 'true'">%TMP%\CoreRunCrashDumps</CrashDumpFolder>
|
| 95 | + </PropertyGroup> |
| 96 | + <PropertyGroup Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OfficialBuildId)' == ''"> |
88 | 97 | <!-- Disable F5 and test explorer support for CI builds. -->
|
89 | 98 | <GenerateLaunchSettings>false</GenerateLaunchSettings>
|
90 | 99 | <IncludeVSTestReferences>false</IncludeVSTestReferences>
|
91 | 100 | </PropertyGroup>
|
92 | 101 |
|
93 |
| - <!-- Provides package dependency version properties and verification/auto-upgrade configuration --> |
94 |
| - <Import Project="$(MSBuildThisFileDirectory)dependencies.props" /> |
95 |
| - |
96 | 102 | <!-- list of nuget package sources passed to nuget restore -->
|
97 | 103 | <!-- Example to consume local CoreCLR package:
|
98 | 104 | /p:OverridePackageSource=C:\coreclr\bin\Product\Windows_NT.x64.Debug\.nuget\pkg
|
|
118 | 124 | <ApiCompatExcludeAttributeList>$(MSBuildThisFileDirectory)tools-local/DefaultGenApiDocIds.txt</ApiCompatExcludeAttributeList>
|
119 | 125 | <!-- Build as portable by default -->
|
120 | 126 | <PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
|
| 127 | + <Performance Condition="'$(Performance)' == ''">false</Performance> |
121 | 128 | <!-- Used for launchSettings.json and runtime config files. -->
|
122 | 129 | <AppDesignerFolder>Properties</AppDesignerFolder>
|
123 | 130 | </PropertyGroup>
|
|
169 | 176 | <_runtimeOS Condition="'$(_runtimeOS)' == 'tizen.5.0.0'">linux</_runtimeOS>
|
170 | 177 | <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS>
|
171 | 178 | <ToolRuntimeRID>$(_runtimeOS)-x64</ToolRuntimeRID>
|
172 |
| - |
| 179 | + |
173 | 180 | <!-- There are no WebAssembly tools, so treat them as Windows -->
|
174 | 181 | <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'WebAssembly'">win-x64</ToolRuntimeRID>
|
175 | 182 | <MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(MicrosoftNetCoreIlasmPackageRuntimeId)' == ''">$(ToolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
|
|
269 | 276 | <Features>strict</Features>
|
270 | 277 | <WarningLevel>4</WarningLevel>
|
271 | 278 | <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
| 279 | + <Deterministic>false</Deterministic> |
272 | 280 | </PropertyGroup>
|
273 | 281 |
|
274 | 282 | <PropertyGroup Condition="'$(IsReferenceAssembly)' == 'true'">
|
|
284 | 292 |
|
285 | 293 | <!-- Set up the default output and intermediate paths -->
|
286 | 294 | <PropertyGroup>
|
287 |
| - <!-- |
288 |
| - Microsoft.NET.TargetFrameworkInference.targets appends the TargetFramework. |
289 |
| - We do this manually and use the TargetGroup instead. |
| 295 | + <!-- |
| 296 | + Microsoft.NET.TargetFrameworkInference.targets appends the TargetFramework. |
| 297 | + We do this manually and use the TargetGroup instead. |
290 | 298 | -->
|
291 | 299 | <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
292 | 300 |
|
|
302 | 310 | <OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)/$(MSBuildProjectName)/$(TargetOutputRelPath)$(OutputPathSubfolder)</OutputPath>
|
303 | 311 |
|
304 | 312 | <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(RootIntermediateOutputPath)$(OSPlatformConfig)/$(MSBuildProjectName)/</BaseIntermediateOutputPath>
|
305 |
| - <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)$(TargetOutputRelPath)</IntermediateOutputPath> |
| 313 | + <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)$(TargetOutputRelPath)</IntermediateOutputPath> |
306 | 314 |
|
307 | 315 | <RuntimePath Condition="'$(RuntimePath)' == ''">$(BinDir)runtime/$(BuildConfiguration)/</RuntimePath>
|
308 | 316 | <ShimsTargetRuntimeRoot>$(BinDir)shimsTargetRuntime/</ShimsTargetRuntimeRoot>
|
|
382 | 390 | <!-- Don't run tests if we're building another platform's binaries on Windows -->
|
383 | 391 | <SkipTests Condition="'$(SkipTests)'=='' and ('$(OsEnvironment)'=='Windows_NT' and '$(TargetsWindows)'!='true' and '$(OSGroup)'!='AnyOS')">true</SkipTests>
|
384 | 392 |
|
385 |
| - <!-- |
| 393 | + <!-- |
386 | 394 | Set these properties early as they are consumed by some test projects.
|
387 | 395 | TODO: Remove when https://github.com/dotnet/corefx/issues/32421 is fixed.
|
388 | 396 | -->
|
|
0 commit comments