Skip to content

R
runtime

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

通知 1
Star 1
Fork 0
R
runtime

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

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

[main] Update dependencies from dotnet/arcade dotnet/runtime... 

[main] Update dependencies from dotnet/arcade dotnet/runtime dotnet/hotreload-utils dotnet/xharness (#52757)

[main] Update dependencies from dotnet/arcade dotnet/runtime dotnet/hotreload-utils dotnet/xharness


 - Merge branch 'main' into darc-main-317b66dc-7ef9-4236-b9c5-988c4d1fe4bd

 - Update Versions.props

 - Update Versions.props
上级 5a0edac8
隐藏空白更改
内联 并排
Showing with 146 addition and 117 deletion
.config/dotnet-tools.json
浏览文件 @ 68ebecbc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
] ]
}, },
"microsoft.dotnet.xharness.cli": { "microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.21263.1", "version": "1.0.0-prerelease.21264.3",
"commands": [ "commands": [
"xharness" "xharness"
] ]
......
eng/Version.Details.xml
浏览文件 @ 68ebecbc
...@@ -6,69 +6,69 @@ ...@@ -6,69 +6,69 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21263.1"> <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01"> <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri> <Uri>https://github.com/microsoft/vstest</Uri>
...@@ -146,49 +146,49 @@ ...@@ -146,49 +146,49 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha> <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.5.21260.1"> <Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.5.21267.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e39196ffc9e50f3d8927622daaedcd50681d56f2</Sha> <Sha>f64f12aa83d9f2253eab10551b716d2ba09371d2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.5.21260.1"> <Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.5.21267.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e39196ffc9e50f3d8927622daaedcd50681d56f2</Sha> <Sha>f64f12aa83d9f2253eab10551b716d2ba09371d2</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.5.21260.1"> <Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.5.21267.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e39196ffc9e50f3d8927622daaedcd50681d56f2</Sha> <Sha>f64f12aa83d9f2253eab10551b716d2ba09371d2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.5.21260.1"> <Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.5.21267.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e39196ffc9e50f3d8927622daaedcd50681d56f2</Sha> <Sha>f64f12aa83d9f2253eab10551b716d2ba09371d2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.5.21260.1"> <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.5.21267.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e39196ffc9e50f3d8927622daaedcd50681d56f2</Sha> <Sha>f64f12aa83d9f2253eab10551b716d2ba09371d2</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Text.Json" Version="6.0.0-preview.5.21260.1"> <Dependency Name="System.Text.Json" Version="6.0.0-preview.5.21267.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e39196ffc9e50f3d8927622daaedcd50681d56f2</Sha> <Sha>f64f12aa83d9f2253eab10551b716d2ba09371d2</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.5.21260.1"> <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.5.21267.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e39196ffc9e50f3d8927622daaedcd50681d56f2</Sha> <Sha>f64f12aa83d9f2253eab10551b716d2ba09371d2</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21264.1"> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21264.1">
<Uri>https://github.com/mono/linker</Uri> <Uri>https://github.com/mono/linker</Uri>
<Sha>7a5c445a69359415b7ff18b91cd24472ef9509ff</Sha> <Sha>7a5c445a69359415b7ff18b91cd24472ef9509ff</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21263.1"> <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21264.3">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9596c3fbbb718819bc4bb9a9e3f6271b50fc718a</Sha> <Sha>2eef520188beb49e31460d0a7dbe040294428ff1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21263.1"> <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21264.3">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9596c3fbbb718819bc4bb9a9e3f6271b50fc718a</Sha> <Sha>2eef520188beb49e31460d0a7dbe040294428ff1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21263.1"> <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21264.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b9758661f4483a70654bcaf6f8d7c6a79ee5660</Sha> <Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
</Dependency> </Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21266.3"> <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21266.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
...@@ -210,9 +210,9 @@ ...@@ -210,9 +210,9 @@
<Uri>https://github.com/dotnet/emsdk</Uri> <Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>411d8383281e4f9f2983b832593e85f9e6e7bbc6</Sha> <Sha>411d8383281e4f9f2983b832593e85f9e6e7bbc6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21261.2"> <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21264.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri> <Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>db44d47059b070a687776ff53edbd618593bbe54</Sha> <Sha>8f9adc23856c391b01fb1904ed2891c1025db1c3</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>
eng/Versions.props
浏览文件 @ 68ebecbc
...@@ -51,28 +51,28 @@ ...@@ -51,28 +51,28 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion> <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpVersion> <MicrosoftCodeAnalysisCSharpVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpVersion>
<!-- Arcade dependencies --> <!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21263.1</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21264.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksFeedVersion> <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21263.1</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21264.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21263.1</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenAPIVersion>6.0.0-beta.21264.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21263.1</MicrosoftDotNetGenFacadesVersion> <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21264.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21263.1</MicrosoftDotNetXUnitExtensionsVersion> <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21264.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21263.1</MicrosoftDotNetXUnitConsoleRunnerVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21264.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksArchivesVersion> <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksPackagingVersion> <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksInstallersVersion> <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21263.1</MicrosoftDotNetRemoteExecutorVersion> <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21264.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21263.1</MicrosoftDotNetVersionToolsTasksVersion> <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21264.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21263.1</MicrosoftDotNetPackageTestingVersion> <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21264.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies --> <!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion> <NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies --> <!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion> <MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.5.21260.1</MicrosoftNETCoreDotNetHostVersion> <MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.5.21267.1</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.5.21260.1</MicrosoftNETCoreDotNetHostPolicyVersion> <MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.5.21267.1</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion> <MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies --> <!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.5.21260.1</MicrosoftNETCoreILAsmVersion> <MicrosoftNETCoreILAsmVersion>6.0.0-preview.5.21267.1</MicrosoftNETCoreILAsmVersion>
<!-- Libraries dependencies --> <!-- Libraries dependencies -->
<StyleCopAnalyzersVersion>1.2.0-beta.304</StyleCopAnalyzersVersion> <StyleCopAnalyzersVersion>1.2.0-beta.304</StyleCopAnalyzersVersion>
<SystemAppContextVersion>4.3.0</SystemAppContextVersion> <SystemAppContextVersion>4.3.0</SystemAppContextVersion>
...@@ -102,14 +102,14 @@ ...@@ -102,14 +102,14 @@
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion> <SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion> <SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion> <SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion>
<SystemTextJsonVersion>6.0.0-preview.5.21260.1</SystemTextJsonVersion> <SystemTextJsonVersion>6.0.0-preview.5.21267.1</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.5.21260.1</SystemRuntimeCompilerServicesUnsafeVersion> <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.5.21267.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingVersion>4.3.0</SystemThreadingVersion> <SystemThreadingVersion>4.3.0</SystemThreadingVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion> <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion> <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion> <MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion> <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-preview.5.21260.1</runtimenativeSystemIOPortsVersion> <runtimenativeSystemIOPortsVersion>6.0.0-preview.5.21267.1</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies --> <!-- Runtime-Assets dependencies -->
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21260.1</SystemComponentModelTypeConverterTestDataVersion> <SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21260.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.21260.1</SystemDrawingCommonTestDataVersion> <SystemDrawingCommonTestDataVersion>6.0.0-beta.21260.1</SystemDrawingCommonTestDataVersion>
...@@ -148,9 +148,9 @@ ...@@ -148,9 +148,9 @@
<!-- 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.21263.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion> <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21264.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21263.1</MicrosoftDotNetXHarnessCLIVersion> <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21264.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21261.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion> <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21264.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<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>
......
eng/common/post-build/sourcelink-validation.ps1
浏览文件 @ 68ebecbc
...@@ -16,6 +16,8 @@ $global:RepoFiles = @{} ...@@ -16,6 +16,8 @@ $global:RepoFiles = @{}
# Maximum number of jobs to run in parallel # Maximum number of jobs to run in parallel
$MaxParallelJobs = 16 $MaxParallelJobs = 16
$MaxRetries = 5
# Wait time between check for system load # Wait time between check for system load
$SecondsBetweenLoadChecks = 10 $SecondsBetweenLoadChecks = 10
...@@ -29,7 +31,10 @@ $ValidatePackage = { ...@@ -29,7 +31,10 @@ $ValidatePackage = {
# Ensure input file exist # Ensure input file exist
if (!(Test-Path $PackagePath)) { if (!(Test-Path $PackagePath)) {
Write-Host "Input file does not exist: $PackagePath" Write-Host "Input file does not exist: $PackagePath"
return 1 return [pscustomobject]@{
result = 1
packagePath = $PackagePath
}
} }
# Extensions for which we'll look for SourceLink information # Extensions for which we'll look for SourceLink information
...@@ -59,7 +64,10 @@ $ValidatePackage = { ...@@ -59,7 +64,10 @@ $ValidatePackage = {
# We ignore resource DLLs # We ignore resource DLLs
if ($FileName.EndsWith('.resources.dll')) { if ($FileName.EndsWith('.resources.dll')) {
return return [pscustomobject]@{
result = 0
packagePath = $PackagePath
}
} }
[System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true)
...@@ -91,36 +99,49 @@ $ValidatePackage = { ...@@ -91,36 +99,49 @@ $ValidatePackage = {
$Status = 200 $Status = 200
$Cache = $using:RepoFiles $Cache = $using:RepoFiles
if ( !($Cache.ContainsKey($FilePath)) ) { $totalRetries = 0
try {
$Uri = $Link -as [System.URI] while ($totalRetries -lt $using:MaxRetries) {
if ( !($Cache.ContainsKey($FilePath)) ) {
# Only GitHub links are valid try {
if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) { $Uri = $Link -as [System.URI]
$Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
# Only GitHub links are valid
if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) {
$Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode
}
else {
# If it's not a github link, we want to break out of the loop and not retry.
$Status = 0
$totalRetries = $using:MaxRetries
}
} }
else { catch {
Write-Host $_
$Status = 0 $Status = 0
} }
} }
catch {
write-host $_
$Status = 0
}
}
if ($Status -ne 200) { if ($Status -ne 200) {
if ($NumFailedLinks -eq 0) { $totalRetries++
if ($FailedFiles.Value -eq 0) {
Write-Host if ($totalRetries -ge $using:MaxRetries) {
if ($NumFailedLinks -eq 0) {
if ($FailedFiles.Value -eq 0) {
Write-Host
}
Write-Host "`tFile $RealPath has broken links:"
}
Write-Host "`t`tFailed to retrieve $Link"
$NumFailedLinks++
} }
Write-Host "`tFile $RealPath has broken links:"
} }
else {
Write-Host "`t`tFailed to retrieve $Link" break
}
$NumFailedLinks++
} }
} }
} }
...@@ -136,7 +157,7 @@ $ValidatePackage = { ...@@ -136,7 +157,7 @@ $ValidatePackage = {
} }
} }
catch { catch {
Write-Host $_
} }
finally { finally {
$zip.Dispose() $zip.Dispose()
...@@ -220,6 +241,7 @@ function ValidateSourceLinkLinks { ...@@ -220,6 +241,7 @@ function ValidateSourceLinkLinks {
# Process each NuGet package in parallel # Process each NuGet package in parallel
Get-ChildItem "$InputPath\*.symbols.nupkg" | Get-ChildItem "$InputPath\*.symbols.nupkg" |
ForEach-Object { ForEach-Object {
Write-Host "Starting $($_.FullName)"
Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null
$NumJobs = @(Get-Job -State 'Running').Count $NumJobs = @(Get-Job -State 'Running').Count
...@@ -267,6 +289,10 @@ function InstallSourcelinkCli { ...@@ -267,6 +289,10 @@ function InstallSourcelinkCli {
try { try {
InstallSourcelinkCli InstallSourcelinkCli
foreach ($Job in @(Get-Job)) {
Remove-Job -Id $Job.Id
}
ValidateSourceLinkLinks ValidateSourceLinkLinks
} }
catch { catch {
......
eng/common/post-build/symbols-validation.ps1
浏览文件 @ 68ebecbc
...@@ -133,27 +133,27 @@ $CountMissingSymbols = { ...@@ -133,27 +133,27 @@ $CountMissingSymbols = {
elseif (Test-Path $SymbolPath) { elseif (Test-Path $SymbolPath) {
return 'Module' return 'Module'
} }
elseif ($output.Contains("503 Service Unavailable")) { else
# If we got a 503 error, we should retry. {
$totalRetries++ $totalRetries++
} }
else {
return $null
}
} }
return $null return $null
} }
$FileGuid = New-Guid
$ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid
$SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault ` $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault `
-FullPath $FileName ` -FullPath $FileName `
-TargetServerParam '--microsoft-symbol-server' ` -TargetServerParam '--microsoft-symbol-server' `
-SymbolsPath $SymbolsPath ` -SymbolsPath "$ExpandedSymbolsPath-msdl" `
-WindowsPdbVerificationParam $WindowsPdbVerificationParam -WindowsPdbVerificationParam $WindowsPdbVerificationParam
$SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault ` $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault `
-FullPath $FileName ` -FullPath $FileName `
-TargetServerParam '--internal-server' ` -TargetServerParam '--internal-server' `
-SymbolsPath $SymbolsPath ` -SymbolsPath "$ExpandedSymbolsPath-symweb" `
-WindowsPdbVerificationParam $WindowsPdbVerificationParam -WindowsPdbVerificationParam $WindowsPdbVerificationParam
Write-Host -NoNewLine "`t Checking file " $FileName "... " Write-Host -NoNewLine "`t Checking file " $FileName "... "
...@@ -217,6 +217,7 @@ function CheckSymbolsAvailable { ...@@ -217,6 +217,7 @@ function CheckSymbolsAvailable {
Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue
} }
$TotalPackages = 0
$TotalFailures = 0 $TotalFailures = 0
$DupedSymbols = 0 $DupedSymbols = 0
...@@ -239,6 +240,8 @@ function CheckSymbolsAvailable { ...@@ -239,6 +240,8 @@ function CheckSymbolsAvailable {
return return
} }
$TotalPackages++
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null
$NumJobs = @(Get-Job -State 'Running').Count $NumJobs = @(Get-Job -State 'Running').Count
...@@ -264,11 +267,11 @@ function CheckSymbolsAvailable { ...@@ -264,11 +267,11 @@ function CheckSymbolsAvailable {
if ($TotalFailures -gt 0 -or $DupedSymbols -gt 0) { if ($TotalFailures -gt 0 -or $DupedSymbols -gt 0) {
if ($TotalFailures -gt 0) { if ($TotalFailures -gt 0) {
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures packages" Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures/$TotalPackages packages"
} }
if ($DupedSymbols -gt 0) { if ($DupedSymbols -gt 0) {
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols packages had duplicated symbol files" Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols/$TotalPackages packages had duplicated symbol files and could not be extracted"
} }
ExitWithExitCode 1 ExitWithExitCode 1
......
global.json
浏览文件 @ 68ebecbc
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
"python3": "3.7.1" "python3": "3.7.1"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21263.1", "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.1", "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21263.1", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21263.1", "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21264.2",
"Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.NoTargets": "2.0.17",
"Microsoft.Build.Traversal": "2.1.1", "Microsoft.Build.Traversal": "2.1.1",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21260.1" "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21267.1"
} }
} }
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或