Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade dotnet/xharness (#50278)
Browse files Browse the repository at this point in the history
[main] Update dependencies from dotnet/arcade dotnet/xharness


 - reintroduce publishing branch workarounds. 

Required while dotnet/arcade#6987 is fixed

 - fix whitespace in publish-using-darc script

 - re-introduce publishing branch workaround

dotnet/arcade#698
  • Loading branch information
dotnet-maestro[bot] authored Mar 28, 2021
1 parent 4f8be19 commit 312521f
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 67 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.21175.2",
"version": "1.0.0-prerelease.21176.1",
"commands": [
"xharness"
]
Expand Down
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,69 +6,69 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21175.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</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 Down Expand Up @@ -198,17 +198,17 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>2f5594e95e1a5227103b9b7d6b92f4b2250be2d7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21175.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21176.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e</Sha>
<Sha>4b4b63fe858a81329d3e6c3f781ce30425ce5dd7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21175.2">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21176.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e</Sha>
<Sha>4b4b63fe858a81329d3e6c3f781ce30425ce5dd7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageValidation" Version="6.0.0-beta.21175.1">
<Dependency Name="Microsoft.DotNet.PackageValidation" Version="6.0.0-beta.21176.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
<Sha>9a72efb067b74bb9147f9413ade6173b568ea1af</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
30 changes: 15 additions & 15 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.9.0-5.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpVersion>3.9.0-5.final</MicrosoftCodeAnalysisCSharpVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21175.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21175.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21175.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21175.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21175.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21175.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21175.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21175.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageValidationVersion>6.0.0-beta.21175.1</MicrosoftDotNetPackageValidationVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21176.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21176.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21176.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21176.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21176.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21176.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21176.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21176.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21176.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21176.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21176.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21176.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageValidationVersion>6.0.0-beta.21176.2</MicrosoftDotNetPackageValidationVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -148,8 +148,8 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21175.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21175.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21176.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21176.1</MicrosoftDotNetXHarnessCLIVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/generate-locproject.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if ($allXlfFiles) {
$langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
}
$langXlfFiles | ForEach-Object {
$null = $_.Name -Match "([^.]+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
$null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf

$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
Expand All @@ -52,7 +52,7 @@ $locJson = @{
LanguageSet = $LanguageSet
LocItems = @(
$locFiles | ForEach-Object {
$outputPath = "Localize\$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
Expand Down
7 changes: 2 additions & 5 deletions eng/common/post-build/publish-using-darc.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,12 @@ try {
$optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
}
}
# note the custom branch to work around https://github.com/dotnet/arcade/issues/6987 . Try to keep this rebased off master if publishing changes

Write-Host "Using Arcade branch master-workaround-publishing-issue to work around disk space issues with alternate build pool. Will be lost on Arcade updates as this is in eng common. Contact dnceng for questions."


& $darc add-build-to-channel `
--id $buildId `
--publishing-infra-version $PublishingInfraVersion `
--default-channels `
--source-branch master-workaround-publishing-issue `
--source-branch main `
--azdev-pat $AzdoToken `
--bar-uri $MaestroApiEndPoint `
--password $MaestroToken `
Expand Down
7 changes: 5 additions & 2 deletions eng/common/templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,19 @@ jobs:

- task: OneLocBuild@2
displayName: OneLocBuild
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
inputs:
locProj: Localize/LocProject.json
outDir: $(Build.ArtifactStagingDirectory)
lclSource: ${{ parameters.LclSource }}
lclPackageId: ${{ parameters.LclPackageId }}
isCreatePrSelected: ${{ parameters.CreatePr }}
repoType: ${{ parameters.RepoType }}
gitHubPatVariable: "${{ parameters.GithubPat }}"
packageSourceAuth: patAuth
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
gitHubPatVariable: "${{ parameters.GithubPat }}"
condition: always()

- task: PublishBuildArtifacts@1
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21175.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21175.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21175.1",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21175.1",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21176.2",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21176.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21176.2",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21176.2",
"Microsoft.Build.NoTargets": "2.0.17",
"Microsoft.Build.Traversal": "2.1.1",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.3.21169.6"
Expand Down

0 comments on commit 312521f

Please sign in to comment.