diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2020-03-10 23:33:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 23:33:27 +0300 |
| commit | 73268c790b7ff31c98a292efbc583e25562074d7 (patch) | |
| tree | fc52a42083d254e44324f63d9ff1afe1ae315b93 /eng/Tools.props | |
| parent | 308ab659f4098bc7df7ed3b1a87a90a209604349 (diff) | |
Revert "Enable restore for ref and src projects in libraries (#33242)" (#33437)
This reverts commit 981cc64bc42eeed5c5634ad8f3680398039603cc.
Diffstat (limited to 'eng/Tools.props')
| -rw-r--r-- | eng/Tools.props | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/eng/Tools.props b/eng/Tools.props index 999758d5f8f..4c399288ad2 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -1,13 +1,39 @@ <Project> - <!-- Import to have access to properties/items used both during the Arcade phase and in the repo. --> - <Import Project="$(MSBuildThisFileDirectory)Configurations.props" /> + <PropertyGroup> + <MSBuildTreatWarningsAsErrors>false</MSBuildTreatWarningsAsErrors> + <EnableAnalyzers>true</EnableAnalyzers> + </PropertyGroup> + <!-- We need to import this props file which contains PackageReferences to analyzers so that + analyzer build assets are imported via the Tools generated props and targets --> + <Import Project="$(RepositoryEngineeringDir)Analyzers.props" Condition="Exists('$(RepositoryEngineeringDir)Analyzers.props') and '$(DotNetBuildFromSource)' != 'true'" /> + + <!-- source-built packages --> <ItemGroup> + <!-- arcade --> + <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" /> <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" /> + + <!-- coreclr --> + <!-- Download the package in the initial arcade restore step to work around race conditions when restoring an msbuild SDK. --> + <PackageDownload Include="Microsoft.NET.Sdk.IL" Version="[$(MicrosoftNETSdkILVersion)]" /> + + <!-- roslyn --> + <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetVersion)" PrivateAssets="all" IsImplicitlyDefined="true" /> + + <!-- mono --> + <PackageReference Include="illink.tasks" Version="$(ILLinkTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" GeneratePathProperty="true" /> + </ItemGroup> + + <!-- excluded from offline portion of source build --> + <ItemGroup Condition="'$(DotNetBuildOffline)' != 'true'"> + <!-- arcade --> + <PackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiVersion)" /> </ItemGroup> <!-- excluded from source build --> <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'"> + <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatVersion)" /> <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" /> <PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" /> |