Skip to content

Commit eb4e85e

Browse files
authored
[release/10.0.1xx-preview6] Use x64 emscripten version for downloading workload packs (#49463) (#49475)
1 parent 85fc0b6 commit eb4e85e

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@
6767
<Dependency Name="Microsoft.NET.Runtime.Emscripten.Sdk.Internal" Version="10.0.0-preview.6.25315.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
6969
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
70-
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
70+
</Dependency>
71+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64" Version="10.0.0-preview.6.25315.102">
72+
<Uri>https://github.com/dotnet/dotnet</Uri>
73+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
7174
</Dependency>
7275
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25315-102">
7376
<Uri>https://github.com/dotnet/dotnet</Uri>

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@
274274
<PropertyGroup>
275275
<!-- Dependencies from https://github.com/dotnet/emsdk -->
276276
<MicrosoftNETRuntimeEmscriptenSdkInternalVersion>10.0.0-preview.6.25315.102</MicrosoftNETRuntimeEmscriptenSdkInternalVersion>
277+
<MicrosoftNETRuntimeEmscripten3156Cachewinx64Version>10.0.0-preview.6.25315.102</MicrosoftNETRuntimeEmscripten3156Cachewinx64Version>
277278
<!-- emscripten versions, these are are included in package IDs and need to be kept in sync with emsdk -->
278279
<EmscriptenVersionCurrent>3.1.56</EmscriptenVersionCurrent>
279280
<EmscriptenVersionNet9>3.1.56</EmscriptenVersionNet9>

src/Workloads/VSInsertion/workloads.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@
9696

9797
<ItemGroup Condition="'$(BuildWorkloads)' == 'true'">
9898
<PackageDownload Include="@(RuntimeWorkloadPacksToDownload)" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" />
99-
<PackageDownload Include="@(EmsdkWorkloadPacksToDownload)" Version="[$(MicrosoftNETRuntimeEmscriptenSdkInternalVersion)]" />
99+
<PackageDownload Include="@(EmsdkWorkloadPacksToDownload)" Version="[$(MicrosoftNETRuntimeEmscripten3156Cachewinx64Version)]" />
100100
</ItemGroup>
101101

102102
<Target Name="_CollectDownloadedWorkloadPacks">
103103
<ItemGroup>
104104
<DownloadedWorkloadPacks Include="$(NuGetPackageRoot)\%(RuntimeWorkloadPacksToDownload.Identity)\$(MicrosoftNETCoreAppRuntimePackageVersion)\*.nupkg" />
105-
<DownloadedWorkloadPacks Include="$(NuGetPackageRoot)\%(EmsdkWorkloadPacksToDownload.Identity)\$(MicrosoftNETRuntimeEmscriptenSdkInternalVersion)\*.nupkg" />
105+
<DownloadedWorkloadPacks Include="$(NuGetPackageRoot)\%(EmsdkWorkloadPacksToDownload.Identity)\$(MicrosoftNETRuntimeEmscripten3156Cachewinx64Version)\*.nupkg" />
106106
</ItemGroup>
107107

108108
<Copy SourceFiles="@(DownloadedWorkloadPacks)"

0 commit comments

Comments
 (0)