提交 0545d9fd 编写于 作者: D dotnet-bot

Merge in 'release/6.0' changes

......@@ -9,7 +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-6c7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6c7f38c6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-864fae9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-864fae9e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
......
......@@ -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.20">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.21">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>6c7f38c614304c93cd392907df7d5e770d5cf7f1</Sha>
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.20">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.21">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>6c7f38c614304c93cd392907df7d5e770d5cf7f1</Sha>
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.20">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.21">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>6c7f38c614304c93cd392907df7d5e770d5cf7f1</Sha>
<Sha>864fae9e00da58498da19b40d46be706a9bf5f47</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
<Uri>https://github.com/dotnet/wcf</Uri>
......
......@@ -175,9 +175,9 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.20</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.20</MicrosoftNETWorkloadEmscriptenManifest60300Version>
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.20</MicrosoftNETWorkloadEmscriptenManifest60400Version>
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.21</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.21</MicrosoftNETWorkloadEmscriptenManifest60300Version>
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.21</MicrosoftNETWorkloadEmscriptenManifest60400Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册