Skip to content

R
runtime

dotNET Platform / runtime
11 个月 前同步成功

通知 1
Star 1
Fork 0
R
runtime

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 05cb4b38 编写于 作者: D dotnet-maestro[bot] 提交者： GitHub
浏览文件
操作

[master] Update dependencies from dotnet/xharness dotnet/llvm-project... 

[master] Update dependencies from dotnet/xharness dotnet/llvm-project dotnet/icu dotnet/arcade (#46450)

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


 - Merge branch 'master' into darc-master-471b4a40-3bef-4a13-b73c-02196b660069

 - Merge branch 'master' into darc-master-471b4a40-3bef-4a13-b73c-02196b660069
上级 e87e32f5
隐藏空白更改
内联 并排
Showing with 88 addition and 86 deletion
.config/dotnet-tools.json
浏览文件 @ 05cb4b38
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
] ]
}, },
"microsoft.dotnet.xharness.cli": { "microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.20621.4", "version": "1.0.0-prerelease.20630.1",
"commands": [ "commands": [
"xharness" "xharness"
] ]
......
eng/Version.Details.xml
浏览文件 @ 05cb4b38
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-alpha.1.20621.2"> <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-alpha.1.20628.1">
<Uri>https://github.com/dotnet/icu</Uri> <Uri>https://github.com/dotnet/icu</Uri>
<Sha>5135179db94078b700b4fb7fb6bce964bd5cf1c2</Sha> <Sha>7dd03ef8233bf8bd614033bf2f961f871564321e</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20630.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20621.12"> <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20630.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.20621.12"> <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3ba79fbd73d6765b67d0f75ac9dac148d6bea346</Sha> <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency> </Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6"> <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> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
...@@ -134,37 +134,37 @@ ...@@ -134,37 +134,37 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri> <Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>eb7c48f9c4b6a199b5c090e301f2895600bbf775</Sha> <Sha>eb7c48f9c4b6a199b5c090e301f2895600bbf775</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20621.1"> <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20628.1">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>acabc6dccdf4e02581bea8eb42b5e48429a44b9c</Sha> <Sha>edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20621.1"> <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20628.1">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>acabc6dccdf4e02581bea8eb42b5e48429a44b9c</Sha> <Sha>edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20621.1"> <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20628.1">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>acabc6dccdf4e02581bea8eb42b5e48429a44b9c</Sha> <Sha>edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20621.1"> <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20628.1">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>acabc6dccdf4e02581bea8eb42b5e48429a44b9c</Sha> <Sha>edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20621.1"> <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20628.1">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>acabc6dccdf4e02581bea8eb42b5e48429a44b9c</Sha> <Sha>edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20621.1"> <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20628.1">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>acabc6dccdf4e02581bea8eb42b5e48429a44b9c</Sha> <Sha>edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20621.1"> <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20628.1">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>acabc6dccdf4e02581bea8eb42b5e48429a44b9c</Sha> <Sha>edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20621.1"> <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20628.1">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>acabc6dccdf4e02581bea8eb42b5e48429a44b9c</Sha> <Sha>edc2f00e30efe8a4a8c3ebe6ed894b97c7ccdf41</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20451.14"> <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20451.14">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -202,13 +202,13 @@ ...@@ -202,13 +202,13 @@
<Uri>https://github.com/mono/linker</Uri> <Uri>https://github.com/mono/linker</Uri>
<Sha>e68a1c586b5b5174e21e3f0d4b00322c547e4c3d</Sha> <Sha>e68a1c586b5b5174e21e3f0d4b00322c547e4c3d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20621.4"> <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20630.1">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>1d3ec3b30c26ebd40cf0312f9f86d95ee2330bd1</Sha> <Sha>71ee4e865578cc9202508d8ae6c14c7c9ecee935</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20621.4"> <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20630.1">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>1d3ec3b30c26ebd40cf0312f9f86d95ee2330bd1</Sha> <Sha>71ee4e865578cc9202508d8ae6c14c7c9ecee935</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>
eng/Versions.props
浏览文件 @ 05cb4b38
...@@ -47,18 +47,18 @@ ...@@ -47,18 +47,18 @@
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview1.20513.4</MicrosoftCodeAnalysisNetAnalyzersVersion> <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview1.20513.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.8.0-4.20503.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion> <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.8.0-4.20503.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<!-- Arcade dependencies --> <!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20621.12</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>6.0.0-beta.20630.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20621.12</MicrosoftDotNetBuildTasksFeedVersion> <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20630.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.20621.12</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.20630.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20621.12</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenAPIVersion>6.0.0-beta.20630.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20621.12</MicrosoftDotNetGenFacadesVersion> <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20630.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20621.12</MicrosoftDotNetXUnitExtensionsVersion> <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20630.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20621.12</MicrosoftDotNetXUnitConsoleRunnerVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20630.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.20621.12</MicrosoftDotNetBuildTasksArchivesVersion> <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.20630.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20630.3</MicrosoftDotNetBuildTasksPackagingVersion> <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20630.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20621.12</MicrosoftDotNetBuildTasksInstallersVersion> <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20630.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20621.12</MicrosoftDotNetRemoteExecutorVersion> <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20630.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20621.12</MicrosoftDotNetVersionToolsTasksVersion> <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20630.2</MicrosoftDotNetVersionToolsTasksVersion>
<!-- NuGet dependencies --> <!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion> <NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies --> <!-- Installer dependencies -->
...@@ -142,8 +142,8 @@ ...@@ -142,8 +142,8 @@
<!-- Testing --> <!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion> <MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion> <MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20621.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion> <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20630.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20621.4</MicrosoftDotNetXHarnessCLIVersion> <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20630.1</MicrosoftDotNetXHarnessCLIVersion>
<XUnitVersion>2.4.1</XUnitVersion> <XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion> <XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion> <CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
...@@ -156,16 +156,16 @@ ...@@ -156,16 +156,16 @@
<!-- ILLink --> <!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>6.0.0-alpha.1.20628.2</MicrosoftNETILLinkTasksVersion> <MicrosoftNETILLinkTasksVersion>6.0.0-alpha.1.20628.2</MicrosoftNETILLinkTasksVersion>
<!-- ICU --> <!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-alpha.1.20621.2</MicrosoftNETCoreRuntimeICUTransportVersion> <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-alpha.1.20628.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM --> <!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20621.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20628.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20621.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20628.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20621.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20628.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20621.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20628.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20621.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20628.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20621.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20628.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20621.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20628.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20621.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20628.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup> </PropertyGroup>
<!-- Override isolated build dependency versions with versions from Repo API. --> <!-- Override isolated build dependency versions with versions from Repo API. -->
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
......
eng/common/tools.sh
浏览文件 @ 05cb4b38
...@@ -273,7 +273,9 @@ function GetDotNetInstallScript { ...@@ -273,7 +273,9 @@ function GetDotNetInstallScript {
if command -v curl > /dev/null; then if command -v curl > /dev/null; then
# first, try directly, if this fails we will retry with verbose logging # first, try directly, if this fails we will retry with verbose logging
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
echo "curl failed; will now retry with verbose logging." echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
echo "Will now retry the same URL with verbose logging."
with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || { with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
local exit_code=$? local exit_code=$?
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
......
global.json
浏览文件 @ 05cb4b38
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
"python3": "3.7.1" "python3": "3.7.1"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20621.12", "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20630.2",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20630.3", "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20630.2",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20621.12", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20630.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20621.12", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20630.2",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20621.12", "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20630.2",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20627.5", "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20627.5",
"Microsoft.Build.NoTargets": "2.0.1", "Microsoft.Build.NoTargets": "2.0.1",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或