Skip to content

Commit 2ff0cc1

Browse files
committed
chore: Adjust version capture
1 parent d9a7132 commit 2ff0cc1

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@
107107
</ItemGroup>
108108
</Target>
109109

110+
<Target Name="_UnoAdjustEmscriptenVersion"
111+
BeforeTargets="_SetupEmscripten;_WorkaroundEmscriptenPathLength">
112+
113+
<PropertyGroup>
114+
<!-- We cannot yet use EmscriptenVersion: https://github.com/dotnet/runtime/issues/108972 -->
115+
<_UnoEmscriptenVersion>$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenSdkToolsPath), 'Microsoft\.NET\.Runtime\.Emscripten\.(?&lt;Version>\d+(\.\d+)*)\.Sdk').Groups['Version'].Value)</_UnoEmscriptenVersion>
116+
</PropertyGroup>
117+
</Target>
110118

111119
<Target Name="_WorkaroundEmscriptenPathLength"
112120
Condition=" '$(OS)' == 'Windows_NT' "
@@ -117,11 +125,6 @@
117125
<_targetEMSDKPath>$(USERPROFILE)\.uno\emsdk\$([System.IO.Path]::GetFileName('$(_emsdkOriginalPackagePath)'))</_targetEMSDKPath>
118126
</PropertyGroup>
119127

120-
<PropertyGroup>
121-
<!-- We cannot yet use EmscriptenVersion: https://github.com/dotnet/runtime/issues/108972 -->
122-
<_UnoEmscriptenVersion>$([System.Text.RegularExpressions.Regex]::Match($(_emsdkOriginalPackagePath), 'Microsoft\.NET\.Runtime\.Emscripten\.(?&lt;Version>\d+(\.\d+)*)\.Sdk').Groups['Version'].Value)</_UnoEmscriptenVersion>
123-
</PropertyGroup>
124-
125128
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(_targetEMSDKPath)'))" />
126129

127130
<Exec Command="mklink /J &quot;$(_targetEMSDKPath)&quot; &quot;$(EmscriptenSdkToolsPath)..\tools\&quot;"

0 commit comments

Comments
 (0)