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/restore | |
| parent | 308ab659f4098bc7df7ed3b1a87a90a209604349 (diff) | |
Revert "Enable restore for ref and src projects in libraries (#33242)" (#33437)
This reverts commit 981cc64bc42eeed5c5634ad8f3680398039603cc.
Diffstat (limited to 'eng/restore')
| -rw-r--r-- | eng/restore/harvestPackages.targets | 42 | ||||
| -rw-r--r-- | eng/restore/repoRestore.props | 2 | ||||
| -rw-r--r-- | eng/restore/repoRestore.targets | 2 |
3 files changed, 3 insertions, 43 deletions
diff --git a/eng/restore/harvestPackages.targets b/eng/restore/harvestPackages.targets deleted file mode 100644 index d6f6f98019f..00000000000 --- a/eng/restore/harvestPackages.targets +++ /dev/null @@ -1,42 +0,0 @@ -<Project InitialTargets="AddPackageDownload"> - <PropertyGroup> - <PackagingTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\</PackagingTaskAssembly> - <PackagingTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'core'">$(PackagingTaskAssembly)netcoreapp2.1\</PackagingTaskAssembly> - <PackagingTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'core'">$(PackagingTaskAssembly)net472\</PackagingTaskAssembly> - <PackagingTaskAssembly>$(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll</PackagingTaskAssembly> - </PropertyGroup> - - <Import Project="$(LibrariesProjectRoot)pkg\baseline\baseline.props" /> - - <UsingTask TaskName="GetLastStablePackage" AssemblyFile="$(PackagingTaskAssembly)"/> - <Target Name="AddPackageDownload"> - <ItemGroup> - <_AllPkgProjs Include="$(LibrariesProjectRoot)*\pkg\**\*.pkgproj" /> - </ItemGroup> - <!-- Need separate ItemGroups so right metadata gets populated --> - <ItemGroup> - <_AllPkgProjsToPackageIdentity Include="@(_AllPkgProjs -> '%(Filename)')" /> - </ItemGroup> - - <GetLastStablePackage - LatestPackages="@(_AllPkgProjsToPackageIdentity)" - PackageIndexes="$(PackageIndexFile)" - DoNotAllowVersionsFromSameRelease="true"> - <Output TaskParameter="LastStablePackages" ItemName="_PackageDownload" /> - </GetLastStablePackage> - - <!-- Allow to override package download and versions in case there is already a PackageDownload set --> - <ItemGroup> - <_OverridenPackageDownloads Include="@(_PackageDownload)" Condition="'@(PackageDownload)' == '@(_PackageDownload)' and %(Identity) != ''" /> - <_PackageDownload Remove="@(_OverridenPackageDownloads)" /> - <_PackageDownload Include="@(PackageDownload)" /> - - <PackageDownload Remove="@(PackageDownload)" /> - <PackageDownload Include="@(_PackageDownload)" Condition="'%(_PackageDownload.IsImplicitlyDefined)' != 'true'" /> - <!-- Add exact version to PackageDownload --> - <PackageDownload> - <Version>[%(Version)]</Version> - </PackageDownload> - </ItemGroup> - </Target> -</Project>
\ No newline at end of file diff --git a/eng/restore/repoRestore.props b/eng/restore/repoRestore.props index 3d6a393519d..204c23d1de0 100644 --- a/eng/restore/repoRestore.props +++ b/eng/restore/repoRestore.props @@ -28,4 +28,4 @@ <ComputeNETCoreBuildOutputFiles>false</ComputeNETCoreBuildOutputFiles> <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles> </PropertyGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets index a430b67fee1..d99f198e1a5 100644 --- a/eng/restore/repoRestore.targets +++ b/eng/restore/repoRestore.targets @@ -4,6 +4,8 @@ <RestoreProjectStyle Condition="'$(MSBuildProjectExtension)' != '.depproj'">Unknown</RestoreProjectStyle> </PropertyGroup> + <Import Project="$(RepositoryEngineeringDir)codeAnalysis.targets" /> + <PropertyGroup> <!-- Nuget will normally disable all generated imports as part of a restore to avoid non-determinism where first restore changes a subsequent restore, |