You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
[release/3.1] Fix use of ilasm during test builds when using a 3.0 SDK (#27818)
* Add fix for restore of ilasm
The restore logic in buildtools tried to use a netcoreapp2.1 TFM for Linux-musl.
This ended up restoring Linux-x64 binaries which then broke the test build.
This change works around this by saving a copy of the depproj that BuildTools used into
the tree and restore it as a 3.0 app manually in init-tools on our side of the build.
* Change to a 3.0 SDK for servicing
@@ -117,6 +114,12 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
117
114
goto :error
118
115
)
119
116
117
+
REM ILasm/ILDasm used to be restored by buildtools. The reference there was a netocreapp2.0, which was prior to our support of linux-musl. We initialize it locally as a 3.0 with the new SDK.
118
+
set /p ILASM_VERSION=<"%~dp0ILAsmVersion.txt"
119
+
if [%NATIVE_TOOLS_RID%] == [] setNATIVE_TOOLS_RID=win-x64
Copy file name to clipboardExpand all lines: init-tools.sh
+8-7Lines changed: 8 additions & 7 deletions
Original file line number
Diff line number
Diff line change
@@ -153,15 +153,8 @@ if [ -z "${__ILASM_RID-}" ]; then
153
153
fi
154
154
155
155
echo"Using RID $__ILASM_RID for BuildTools native tools"
156
-
157
-
export ILASMCOMPILER_VERSION=$__ILASM_VERSION
158
156
export NATIVE_TOOLS_RID=$__ILASM_RID
159
157
160
-
if [ -n"${DotNetBootstrapCliTarPath-}" ];then
161
-
# Assume ilasm is not in nuget yet when bootstrapping...
162
-
unset ILASMCOMPILER_VERSION
163
-
fi
164
-
165
158
# Build tools only supported on x64
166
159
if [ "${__PKG_ARCH}"!="x64" ] && [ "${__PKG_ARCH}"!="arm" ];then
167
160
echo"Skipped installing build tools."
@@ -178,6 +171,14 @@ else
178
171
exit 1
179
172
fi
180
173
174
+
175
+
if [ !-n"${DotNetBootstrapCliTarPath-}" ];then
176
+
# Assume ilasm is not in nuget yet when bootstrapping...
177
+
# ILasm/ILDasm used to be restored by buildtools. The reference there was a netocreapp2.0, which was prior to our support of linux-musl. We initialize it locally as a 3.0 with the new SDK.
0 commit comments