diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2022-10-23 20:22:21 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2022-10-23 20:22:21 +0300 |
| commit | 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 (patch) | |
| tree | 60187b8969ded2a8d681828ce580ab32e4e49369 | |
| parent | 578df65a129d2cfeba9538bfa0674855c3cb3f18 (diff) | |
| parent | fe217956fd128732279c1d01d854d025f8e225d1 (diff) | |
Merge in 'release/6.0' changesv6.0.11
| -rw-r--r-- | NuGet.config | 7 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 12 | ||||
| -rw-r--r-- | eng/Versions.props | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/NuGet.config b/NuGet.config index 8ed75e08693..a98f6210739 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,12 +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-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-c3fc739-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-5/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-c3fc739-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-4/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-c3fc739-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-3/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-c3fc739-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-2/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-c3fc739-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c-1/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-374833d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-374833d8/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 f75b478e687..d141a5d00e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ <Uri>https://github.com/dotnet/msquic</Uri> <Sha>98129287d56a5e0348c291ce4260e630b4aa510d</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.10"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.11"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>c3fc739ca5a38641fe021f94c3986465296c71e0</Sha> + <Sha>374833d8416df22155bc0509559352af65bd8266</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.10"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.11"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>c3fc739ca5a38641fe021f94c3986465296c71e0</Sha> + <Sha>374833d8416df22155bc0509559352af65bd8266</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.10"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.11"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>c3fc739ca5a38641fe021f94c3986465296c71e0</Sha> + <Sha>374833d8416df22155bc0509559352af65bd8266</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 86387afd4b7..b573ecafe19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,9 +172,9 @@ <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <!-- emscripten / Node --> - <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.10</MicrosoftNETWorkloadEmscriptenManifest60100Version> - <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.10</MicrosoftNETWorkloadEmscriptenManifest60300Version> - <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.10</MicrosoftNETWorkloadEmscriptenManifest60400Version> + <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.11</MicrosoftNETWorkloadEmscriptenManifest60100Version> + <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.11</MicrosoftNETWorkloadEmscriptenManifest60300Version> + <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.11</MicrosoftNETWorkloadEmscriptenManifest60400Version> <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion> <!-- workloads --> <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion> |