未验证 提交 e96bae71 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

[main] Update dependencies from dotnet/arcade dotnet/icu dotnet/xharness...

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

[main] Update dependencies from dotnet/arcade dotnet/icu dotnet/xharness dotnet/hotreload-utils
上级 a9782f05
......@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.21268.1",
"version": "1.0.0-prerelease.21271.1",
"commands": [
"xharness"
]
......
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-preview.5.21267.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-preview.6.21268.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>39013b42331e508a2fd4752a3336285ba35cb82f</Sha>
<Sha>207094bcc62a9235861af5e5a6f322f2039e71c6</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21264.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
......@@ -178,17 +178,17 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>a621b9a630950026f5508c8089a59c0e825bd6e0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21268.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21271.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>769fd62b966f20a44d0800cdfeecb7d86e10f348</Sha>
<Sha>98970876f4d21e6da5198a5c41de51ab1101089f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21268.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21271.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>769fd62b966f20a44d0800cdfeecb7d86e10f348</Sha>
<Sha>98970876f4d21e6da5198a5c41de51ab1101089f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21264.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21271.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>42de78a825b575a1ddeb73020a01fb8cd9311d09</Sha>
<Sha>50f5645789f9119c906755cb1d2549acdeb0d0b7</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21271.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
......@@ -210,9 +210,9 @@
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5a2a6482a34c2fe9ed4f9f97bb787ef0a7737965</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21267.1">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21271.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>53cf59cd8a221289d1d138ac6a8097ea457e4252</Sha>
<Sha>54f4f9773ee08a6c248fc7857684cab3ab48a82d</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
......@@ -51,19 +51,19 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21264.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21264.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21264.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21264.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21264.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21264.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21264.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21264.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21264.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21264.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21271.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21271.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21271.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21271.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21271.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21271.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21271.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21271.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21271.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21271.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21271.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21271.3</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
......@@ -148,9 +148,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21268.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21268.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21267.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21271.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21271.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21271.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
......@@ -164,7 +164,7 @@
<MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21267.3</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21267.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.6.21268.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21267.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21267.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
......
......@@ -14,7 +14,7 @@ $ErrorActionPreference = "Stop"
Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json"
$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
$exclusions = @{ Exclusions = @() }
if (Test-Path -Path $exclusionsFilePath)
{
......@@ -92,14 +92,14 @@ Write-Host "LocProject.json generated:`n`n$json`n`n"
Pop-Location
if (!$UseCheckedInLocProjectJson) {
New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
Set-Content "$SourcesDirectory\Localize\LocProject.json" $json
New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json
}
else {
New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json
if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) {
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
exit 1
......
......@@ -53,7 +53,7 @@ jobs:
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
inputs:
locProj: Localize/LocProject.json
locProj: eng/Localize/LocProject.json
outDir: $(Build.ArtifactStagingDirectory)
lclSource: ${{ parameters.LclSource }}
lclPackageId: ${{ parameters.LclPackageId }}
......@@ -79,7 +79,7 @@ jobs:
- task: PublishBuildArtifacts@1
displayName: Publish LocProject.json
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
PublishLocation: Container
ArtifactName: Loc
condition: ${{ parameters.condition }}
\ No newline at end of file
......@@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21271.3",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21271.3",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21271.3",
"Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23",
"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.
先完成此消息的编辑!
想要评论请 注册