diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2023-10-19 22:52:33 +0000 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2023-10-19 22:52:33 +0000 |
| commit | 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 (patch) | |
| tree | bf751048aff0759b18ea85da0b27be42822cdf87 | |
| parent | d7b9518372d8e9988e62154d73453e7df508df2c (diff) | |
| parent | f1bfdda0de2a78bc79a356d24bff876c742a5992 (diff) | |
Merge in 'release/6.0' changesv6.0.25
| -rw-r--r-- | NuGet.config | 1 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 12 | ||||
| -rw-r--r-- | eng/Versions.props | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/NuGet.config b/NuGet.config index d5dbd101f043..67257f27c2e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-emsdk --> + <add key="darc-pub-dotnet-emsdk-d8bc162" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d8bc162c/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-wcf --> <!-- End: Package sources from dotnet-wcf --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 502cb6aaaffe..596fed32e38b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ <Uri>https://github.com/dotnet/msquic</Uri> <Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.23"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.25"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha> + <Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.23"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.25"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha> + <Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.23"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.25"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha> + <Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha> </Dependency> <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0"> <Uri>https://github.com/dotnet/wcf</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 64cf7d3326b4..6d48c2ff982b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,9 +176,9 @@ <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <!-- emscripten / Node --> - <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.23</MicrosoftNETWorkloadEmscriptenManifest60100Version> - <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.23</MicrosoftNETWorkloadEmscriptenManifest60300Version> - <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.23</MicrosoftNETWorkloadEmscriptenManifest60400Version> + <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60100Version> + <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60300Version> + <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60400Version> <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion> <!-- workloads --> <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion> |