diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2023-10-19 22:52:29 +0000 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2023-10-19 22:52:29 +0000 |
| commit | 808851b07acfa1c5c94b0d4f9fb50debedb2df70 (patch) | |
| tree | 03354ffd27fb1bb30456a3fa6c87d045a217dbb5 | |
| parent | 2527cb5f039d4ec799a3c61b4cab7723eff9be37 (diff) | |
| parent | 3a7f798d88e987482bcba48d5bf92ae23696bdbb (diff) | |
Merge in 'release/7.0' changesv7.0.14
| -rw-r--r-- | NuGet.config | 4 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 8 | ||||
| -rw-r--r-- | eng/Versions.props | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/NuGet.config b/NuGet.config index 2934c726b39d..8b15ede9f76d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +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-9506882" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-95068821/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-44da825" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-44da825c/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-6f67d4a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6f67d4ab/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-942bfc8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-942bfc8c/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!-- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 090b17a0e02f..2b394e2a6d7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,13 +48,13 @@ <Uri>https://github.com/dotnet/command-line-api</Uri> <Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.13"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.14"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>44da825cb96e08d28d258c5cda0ba14bbc4f91c3</Sha> + <Sha>942bfc8cb73e3cfea523cb0a2f08b415b2220358</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.13"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.14"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>44da825cb96e08d28d258c5cda0ba14bbc4f91c3</Sha> + <Sha>942bfc8cb73e3cfea523cb0a2f08b415b2220358</Sha> </Dependency> </ProductDependencies> <ToolsetDependencies> diff --git a/eng/Versions.props b/eng/Versions.props index ec937e9a62fc..cd780f1b0b7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,8 +22,8 @@ <UsingToolIbcOptimization>false</UsingToolIbcOptimization> <UsingToolXliff>false</UsingToolXliff> <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion> - <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.13</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> - <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.13</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.14</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.14</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> </PropertyGroup> <ItemGroup> <!-- The bands we want to produce workload manifests for --> |