diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2022-03-09 21:48:16 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2022-03-09 21:48:16 +0300 |
| commit | 288d311fe30c03a8216c15b032d9ec213cd4d40c (patch) | |
| tree | b6f4e9919d46aeddc395392e6df33e1b0813efab | |
| parent | 1565e21bff74b8493a55fc0058cea37ac7ac2343 (diff) | |
| parent | 10b175153ef3d9c8179bf9cace0af02451105fc4 (diff) | |
Merge in 'release/6.0' changes
| -rw-r--r-- | eng/Version.Details.xml | 8 | ||||
| -rw-r--r-- | eng/Versions.props | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4811b833776..e74a2c20faf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,6 +12,14 @@ <Uri>https://github.com/dotnet/emsdk</Uri> <Sha>ee0a97a0009c0e048789126253fea7994db676ac</Sha> </Dependency> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.200" Version="6.0.2"> + <Uri>https://github.com/dotnet/emsdk</Uri> + <Sha>ee0a97a0009c0e048789126253fea7994db676ac</Sha> + </Dependency> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.2"> + <Uri>https://github.com/dotnet/emsdk</Uri> + <Sha>ee0a97a0009c0e048789126253fea7994db676ac</Sha> + </Dependency> <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0"> <Uri>https://github.com/dotnet/wcf</Uri> <Sha>04c3656e0325277aefa18378f24238d39b259222</Sha> diff --git a/eng/Versions.props b/eng/Versions.props index 930c972e0d5..daf62395919 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,6 +170,8 @@ <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <!-- emscripten / Node --> <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.2</MicrosoftNETWorkloadEmscriptenManifest60100Version> + <MicrosoftNETWorkloadEmscriptenManifest60200Version>6.0.2</MicrosoftNETWorkloadEmscriptenManifest60200Version> + <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.2</MicrosoftNETWorkloadEmscriptenManifest60300Version> <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion> <!-- workloads --> <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion> |