Skip to content

Commit 5eda8d4

Browse files
authored
Make the Python manifest optional on Linux (#31761)
1 parent 686da2e commit 5eda8d4

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/Components/WebAssembly/BlazorManifest/acquire/Program.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ static void Move(string source, string destination)
113113
throw new NotSupportedException("Unsupported OS platform.");
114114
}
115115
}
116-
packs.Add((packageName, item.Value.Version));
116+
117+
if (!string.IsNullOrEmpty(packageName))
118+
{
119+
packs.Add((packageName, item.Value.Version));
120+
}
117121
}
118122

119123
return packs;

src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"alias-to": {
4949
"win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x86",
5050
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64",
51-
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.linux-x64",
51+
"linux-x64": null,
5252
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.osx-x64"
5353
}
5454
},

src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task" />
88
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk" />
99
<Import Project="Sdk.props" Sdk="Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm" />
10-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" />
10+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
1111
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node" />
1212
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk" />
1313
</ImportGroup>

0 commit comments

Comments
 (0)