|
| 1 | +From 340b200c6f0efe8dbe38186a5c94ba28cd9bfd5f Mon Sep 17 00:00:00 2001 |
| 2 | +From: Davis Goodin < [email protected]> |
| 3 | +Date: Mon, 21 Dec 2020 15:17:22 -0600 |
| 4 | +Subject: [PATCH] Don't use RTMVersion in source-build |
| 5 | + |
| 6 | +This seems like it would bring in prebuilts, and more directly, causes: |
| 7 | + |
| 8 | + Detected package downgrade: System.Security.Cryptography.Pkcs from 5.0.1 to 5.0.0. Reference the package directly from the project to select a different version. |
| 9 | + RepoTasks -> NuGet.Packaging 5.8.0-rc.6930 -> System.Security.Cryptography.Pkcs (>= 5.0.1) |
| 10 | + RepoTasks -> System.Security.Cryptography.Pkcs (>= 5.0.0) |
| 11 | +--- |
| 12 | + eng/Dependencies.props | 6 +++++- |
| 13 | + 1 file changed, 5 insertions(+), 1 deletion(-) |
| 14 | + |
| 15 | +diff --git a/eng/Dependencies.props b/eng/Dependencies.props |
| 16 | +index d573a7bde9..79436b5a16 100644 |
| 17 | +--- a/eng/Dependencies.props |
| 18 | ++++ b/eng/Dependencies.props |
| 19 | +@@ -198,7 +198,11 @@ and are generated based on the last package release. |
| 20 | + <!-- Get versions. --> |
| 21 | + <LatestPackageReference Update="@(LatestPackageReference)"> |
| 22 | + <Version>$(%(VersionName)PackageVersion)</Version> |
| 23 | +- <RTMVersion>$(%(VersionName)V0PackageVersion)</RTMVersion> |
| 24 | ++ <!-- |
| 25 | ++ Don't set RTMVersion if building from source. RTMVersion represents a downlevel version of |
| 26 | ++ the package, which we don't have access to in source-build. (It would be a prebuilt.) |
| 27 | ++ --> |
| 28 | ++ <RTMVersion Condition="'$(DotNetBuildFromSource)' != 'true'">$(%(VersionName)V0PackageVersion)</RTMVersion> |
| 29 | + |
| 30 | + <!-- Remove excess metadata. --> |
| 31 | + <RTMVersion Condition=" '%(Version)' == '%(RTMVersion)' " /> |
| 32 | +-- |
| 33 | +2.25.4 |
| 34 | + |
0 commit comments