Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/icu dotnet/llvm-project dotn…
Browse files Browse the repository at this point in the history
…et/arcade dotnet/runtime-assets dotnet/xharness (dotnet#44459)

[master] Update dependencies from dotnet/icu  dotnet/llvm-project dotnet/arcade dotnet/runtime-assets dotnet/xharness


 - Merge branch 'master' into darc-master-f04f89fe-a712-45ce-96bf-a8d278fcda72

 - Revert changes to dotnet sdk in global.json

See dotnet#45108 (review)
  • Loading branch information
dotnet-maestro[bot] committed Nov 25, 2020
1 parent 2c155c2 commit 96a49a1
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 114 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.20559.2",
"version": "1.0.0-prerelease.20574.2",
"commands": [
"xharness"
]
Expand Down
144 changes: 72 additions & 72 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,75 +4,75 @@
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>cfe95a23647c7de1fe1a349343115bd7720d6949</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-alpha.1.20552.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-alpha.1.20573.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>a39deb47c8f20ed5adb57cddbc83ac587413c4e4</Sha>
<Sha>f9c78959ceca029309ae76932fb441cacb9650d1</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20563.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.20567.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>94dab3b0a2c74c53d7552c6985eafea4629d0eb9</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20563.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20573.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fea3a1b584e3ddd9145d80a0cfb51e3e658c464</Sha>
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand All @@ -98,73 +98,73 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>b195e2589980861425b331e73a859252c3f2b71a</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.Net.TestData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20527.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20568.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
<Sha>8c81a93d8914cc77a9858152c44e395b81083de5</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20552.1">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20573.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
<Sha>395ff4866ce6b470b4d96ee599ebf6dc57fb7dd6</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20552.1">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20573.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
<Sha>395ff4866ce6b470b4d96ee599ebf6dc57fb7dd6</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20552.1">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20573.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
<Sha>395ff4866ce6b470b4d96ee599ebf6dc57fb7dd6</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20552.1">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20573.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
<Sha>395ff4866ce6b470b4d96ee599ebf6dc57fb7dd6</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20552.1">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20573.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
<Sha>395ff4866ce6b470b4d96ee599ebf6dc57fb7dd6</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20552.1">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20573.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
<Sha>395ff4866ce6b470b4d96ee599ebf6dc57fb7dd6</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20552.1">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20573.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
<Sha>395ff4866ce6b470b4d96ee599ebf6dc57fb7dd6</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20552.1">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20573.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
<Sha>395ff4866ce6b470b4d96ee599ebf6dc57fb7dd6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20451.14">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -198,13 +198,13 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>8ee2557ccbaf9e4cf243f15b8cb95da4eddb18aa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20555.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20574.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ab2eee629494e7a17592feda257b4ede4ff2fc82</Sha>
<Sha>ac9663744a551bf5e524165e1467c4fb22a80163</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20555.2">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20574.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ab2eee629494e7a17592feda257b4ede4ff2fc82</Sha>
<Sha>ac9663744a551bf5e524165e1467c4fb22a80163</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
Loading

0 comments on commit 96a49a1

Please sign in to comment.