Skip to content

Commit 15a8762

Browse files
committed
aspnetcore: Binlog for tools, rm RTMVersion infra
The RTMVersion infra looks like it would bring in prebuilts. (It's just a guess at a fix for RepoTasks.csproj.)
1 parent 10818b7 commit 15a8762

File tree

2 files changed

+59
-0
lines changed

2 files changed

+59
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 8f63217ad54ec431e398753b2bf745a1eb565e36 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <[email protected]>
3+
Date: Mon, 21 Dec 2020 14:37:58 -0600
4+
Subject: [PATCH] Emit RepoTasks.binlog
5+
6+
Lets us diagnose errors that occur while building RepoTasks.csproj.
7+
---
8+
build.sh | 1 +
9+
1 file changed, 1 insertion(+)
10+
11+
diff --git a/build.sh b/build.sh
12+
index 3c3cab39ce..029bb4f0c8 100755
13+
--- a/build.sh
14+
+++ b/build.sh
15+
@@ -360,6 +360,7 @@ if [ "$build_repo_tasks" = true ]; then
16+
-p:Restore=$run_restore \
17+
-p:Build=true \
18+
-clp:NoSummary \
19+
+ -bl:RepoTasks.binlog \
20+
${toolset_build_args[@]+"${toolset_build_args[@]}"}
21+
fi
22+
23+
--
24+
2.25.4
25+
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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

Comments
 (0)