diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2024-01-19 23:04:03 +0000 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2024-01-19 23:04:03 +0000 |
| commit | 80de56dadb3864aec7e8edd3ae32a23aeda08285 (patch) | |
| tree | ae51613b246dc7185d05551e2ce86ad19b71ff4a | |
| parent | 32bc9e9e11138e57ee329f06cc1e870075eda725 (diff) | |
| parent | a43d69fecdf5869a48a9b1ed5127fe8ba1fa6d66 (diff) | |
Merge in 'release/6.0' changesv6.0.27
| -rw-r--r-- | NuGet.config | 5 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 12 | ||||
| -rw-r--r-- | eng/Versions.props | 6 |
3 files changed, 10 insertions, 13 deletions
diff --git a/NuGet.config b/NuGet.config index 0a21a797a52e..e783811bd4f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +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-5ccc36f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-5ccc36f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5-2/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-5ccc36f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5-1/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-5460e2c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5460e2cb/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-a9f209f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a9f209f8/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 0fedcb3cb5ec..31f99b11d9f1 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.26"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.27"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>5460e2cb3721954528c452d9d32474e4c32b7141</Sha> + <Sha>a9f209f82fadb1f694ae6932f92c32918e407ded</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.26"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.27"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>5460e2cb3721954528c452d9d32474e4c32b7141</Sha> + <Sha>a9f209f82fadb1f694ae6932f92c32918e407ded</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.26"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.27"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>5460e2cb3721954528c452d9d32474e4c32b7141</Sha> + <Sha>a9f209f82fadb1f694ae6932f92c32918e407ded</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 d020ffab9cb0..3ff76043c14b 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.26</MicrosoftNETWorkloadEmscriptenManifest60100Version> - <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.26</MicrosoftNETWorkloadEmscriptenManifest60300Version> - <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.26</MicrosoftNETWorkloadEmscriptenManifest60400Version> + <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.27</MicrosoftNETWorkloadEmscriptenManifest60100Version> + <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.27</MicrosoftNETWorkloadEmscriptenManifest60300Version> + <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.27</MicrosoftNETWorkloadEmscriptenManifest60400Version> <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion> <!-- workloads --> <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion> |