diff options
author | Viktor Hofer <viktor.hofer@microsoft.com> | 2020-03-10 15:48:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-10 15:48:20 +0300 |
commit | 981cc64bc42eeed5c5634ad8f3680398039603cc (patch) | |
tree | 89375dea539687d34136588b5e607a25dc5113fe /eng/Tools.props | |
parent | 4d2a2da73d060e43f8d2dd68276ee2f7aeea3211 (diff) |
Enable restore for ref and src projects in libraries (#33242)
* Enable restore for projects in libraries
Enabling project restore for ref and src projects
* Remove winrt.depproj
* Remove tools.depproj
* Enable upfront restore
* Fix casing of PInvokeAnalyzerException file
* Remove harvestPackages.depproj and refactoring
Removing havestPackages.depproj in favor of a target that is hooked
into Arcade's repo restore phase in Tools.props.
Additionally moving common properties that are used both in Arcade and
the repo inside Configurations.props. Before they were scattered around
multiple places (Versions.props, Subsets.props).
* Set ilasm/ildasm RID for restore
* Sequence restore into steps out of upfront restore
* Fix docker entrypoints by using build.cmd/sh
Diffstat (limited to 'eng/Tools.props')
-rw-r--r-- | eng/Tools.props | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/eng/Tools.props b/eng/Tools.props index 4c399288ad2..999758d5f8f 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -1,39 +1,13 @@ <Project> - <PropertyGroup> - <MSBuildTreatWarningsAsErrors>false</MSBuildTreatWarningsAsErrors> - <EnableAnalyzers>true</EnableAnalyzers> - </PropertyGroup> + <!-- Import to have access to properties/items used both during the Arcade phase and in the repo. --> + <Import Project="$(MSBuildThisFileDirectory)Configurations.props" /> - <!-- 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)" /> |