From 48f64933429ed71bfe3ce4c4f436d1d47028224d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Apr 2021 12:10:07 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/xharness build 20210428.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21227.1 -> To Version 1.0.0-prerelease.21228.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 386478a4c10d1..21bc624997c9a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21227.1", + "version": "1.0.0-prerelease.21228.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0406faf55f03a..a898befde417a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,13 +198,13 @@ https://github.com/mono/linker 1dfcf3077aca1ea77850f409d95c3192f03507b3 - + https://github.com/dotnet/xharness - 0e95171622e7facccb7cf0a9e4340122b0357b61 + 1bbdd1feca47819ab490c64eba7570b8dd54cd3e - + https://github.com/dotnet/xharness - 0e95171622e7facccb7cf0a9e4340122b0357b61 + 1bbdd1feca47819ab490c64eba7570b8dd54cd3e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e823b627f86e1..79c0ded43506b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,8 +153,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21227.1 - 1.0.0-prerelease.21227.1 + 1.0.0-prerelease.21228.1 + 1.0.0-prerelease.21228.1 2.4.1 2.4.2 1.3.0 From 5284834764319257a9469bffd4745ae65c454e24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Apr 2021 12:15:38 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/arcade build 20210428.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21222.1 -> To Version 6.0.0-beta.21228.3 --- eng/Version.Details.xml | 68 ++++++++++++------------ eng/Versions.props | 26 ++++----- eng/common/templates/job/onelocbuild.yml | 8 +-- global.json | 12 ++--- 4 files changed, 58 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a898befde417a..d1d12402650ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -206,9 +206,9 @@ https://github.com/dotnet/xharness 1bbdd1feca47819ab490c64eba7570b8dd54cd3e - + https://github.com/dotnet/arcade - b7279bb45342c948ab46fea2d08ec17ae2f2a1bf + e1044f09e18638a98a9f0448086a7295f3d16834 diff --git a/eng/Versions.props b/eng/Versions.props index 79c0ded43506b..5f35108a68484 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,19 +54,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 2.5.1-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 - 6.0.0-beta.21222.1 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 2.5.1-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 + 6.0.0-beta.21228.3 5.9.0-preview.2 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index d2b271ec1ac13..b27d6faf3035d 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -17,6 +17,7 @@ parameters: LclSource: lclFilesInRepo LclPackageId: '' RepoType: gitHub + condition: '' jobs: - job: OneLocBuild @@ -44,6 +45,7 @@ jobs: filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json + condition: ${{ parameters.condition }} - task: OneLocBuild@2 displayName: OneLocBuild @@ -62,7 +64,7 @@ jobs: ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" - condition: always() + condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 displayName: Publish Localization Files @@ -70,7 +72,7 @@ jobs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' PublishLocation: Container ArtifactName: Loc - condition: always() + condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json @@ -78,4 +80,4 @@ jobs: PathtoPublish: '$(Build.SourcesDirectory)/Localize/' PublishLocation: Container ArtifactName: Loc - condition: always() \ No newline at end of file + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index f1d09921257f3..c236486854418 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.100-preview.2.21155.3", + "version": "6.0.100-preview.3.21202.5", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.2.21155.3" + "dotnet": "6.0.100-preview.3.21202.5" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21222.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21222.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21222.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21228.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21228.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21228.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21228.3", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21226.1" From d358187b373966517c5754a533bf55abacbd35a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Apr 2021 12:48:40 +0000 Subject: [PATCH 03/14] Update dependencies from https://github.com/dotnet/xharness build 20210429.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21227.1 -> To Version 1.0.0-prerelease.21229.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 21bc624997c9a..fb2752cc154a5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21228.1", + "version": "1.0.0-prerelease.21229.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1d12402650ad..a1d8310be4fa9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,13 +198,13 @@ https://github.com/mono/linker 1dfcf3077aca1ea77850f409d95c3192f03507b3 - + https://github.com/dotnet/xharness - 1bbdd1feca47819ab490c64eba7570b8dd54cd3e + da00b833408e130d3df1e61d99e37655c4b41510 - + https://github.com/dotnet/xharness - 1bbdd1feca47819ab490c64eba7570b8dd54cd3e + da00b833408e130d3df1e61d99e37655c4b41510 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 5f35108a68484..8872c1707df2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,8 +153,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21228.1 - 1.0.0-prerelease.21228.1 + 1.0.0-prerelease.21229.3 + 1.0.0-prerelease.21229.3 2.4.1 2.4.2 1.3.0 From 32a25a5806fad2725def7f9ef50bb0358cca3a02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Apr 2021 12:12:49 +0000 Subject: [PATCH 04/14] Update dependencies from https://github.com/dotnet/arcade build 20210429.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21222.1 -> To Version 6.0.0-beta.21229.1 --- eng/Version.Details.xml | 68 +++++++------- eng/Versions.props | 26 +++--- eng/common/post-build/symbols-validation.ps1 | 94 +++++++++++--------- global.json | 8 +- 4 files changed, 102 insertions(+), 94 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1d8310be4fa9..0d12302029235 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -206,9 +206,9 @@ https://github.com/dotnet/xharness da00b833408e130d3df1e61d99e37655c4b41510 - + https://github.com/dotnet/arcade - e1044f09e18638a98a9f0448086a7295f3d16834 + 67f4230b38092d53d8f8d3a37301feb997adf26c diff --git a/eng/Versions.props b/eng/Versions.props index 8872c1707df2c..b419d33d81646 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,19 +54,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 2.5.1-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 - 6.0.0-beta.21228.3 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 2.5.1-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 + 6.0.0-beta.21229.1 5.9.0-preview.2 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 99bf28cd5c1b5..e6d5d2fd05455 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -1,9 +1,10 @@ param( - [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored - [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use - [Parameter(Mandatory=$false)][switch] $ContinueOnError, # If we should keep checking symbols after an error - [Parameter(Mandatory=$false)][switch] $Clean # Clean extracted symbols directory after checking symbols + [Parameter(Mandatory = $true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored + [Parameter(Mandatory = $true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation + [Parameter(Mandatory = $true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use + [Parameter(Mandatory = $false)][switch] $CheckForWindowsPdbs, # If we should check for the existence of windows pdbs in addition to portable PDBs + [Parameter(Mandatory = $false)][switch] $ContinueOnError, # If we should keep checking symbols after an error + [Parameter(Mandatory = $false)][switch] $Clean # Clean extracted symbols directory after checking symbols ) # Maximum number of jobs to run in parallel @@ -19,9 +20,15 @@ $SecondsBetweenLoadChecks = 10 Set-Variable -Name "ERROR_BADEXTRACT" -Option Constant -Value -1 Set-Variable -Name "ERROR_FILEDOESNOTEXIST" -Option Constant -Value -2 +$WindowsPdbVerificationParam = "" +if ($CheckForWindowsPdbs) { + $WindowsPdbVerificationParam = "--windows-pdbs" +} + $CountMissingSymbols = { param( - [string] $PackagePath # Path to a NuGet package + [string] $PackagePath, # Path to a NuGet package + [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs ) . $using:PSScriptRoot\..\tools.ps1 @@ -34,7 +41,7 @@ $CountMissingSymbols = { if (!(Test-Path $PackagePath)) { Write-PipelineTaskError "Input file does not exist: $PackagePath" return [pscustomobject]@{ - result = $using:ERROR_FILEDOESNOTEXIST + result = $using:ERROR_FILEDOESNOTEXIST packagePath = $PackagePath } } @@ -57,24 +64,25 @@ $CountMissingSymbols = { Write-Host "Something went wrong extracting $PackagePath" Write-Host $_ return [pscustomobject]@{ - result = $using:ERROR_BADEXTRACT + result = $using:ERROR_BADEXTRACT packagePath = $PackagePath } } Get-ChildItem -Recurse $ExtractPath | - Where-Object {$RelevantExtensions -contains $_.Extension} | - ForEach-Object { - $FileName = $_.FullName - if ($FileName -Match '\\ref\\') { - Write-Host "`t Ignoring reference assembly file " $FileName - return - } + Where-Object { $RelevantExtensions -contains $_.Extension } | + ForEach-Object { + $FileName = $_.FullName + if ($FileName -Match '\\ref\\') { + Write-Host "`t Ignoring reference assembly file " $FileName + return + } - $FirstMatchingSymbolDescriptionOrDefault = { + $FirstMatchingSymbolDescriptionOrDefault = { param( - [string] $FullPath, # Full path to the module that has to be checked - [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $FullPath, # Full path to the module that has to be checked + [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols + [string] $WindowsPdbVerificationParam, # Parameter to pass to potential check for windows-pdbs. [string] $SymbolsPath ) @@ -99,7 +107,7 @@ $CountMissingSymbols = { # DWARF file for a .dylib $DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf') - + $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools" $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe" @@ -107,7 +115,7 @@ $CountMissingSymbols = { while ($totalRetries -lt $using:MaxRetry) { # Save the output and get diagnostic output - $output = & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String + $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String if (Test-Path $PdbPath) { return 'PDB' @@ -136,30 +144,30 @@ $CountMissingSymbols = { return $null } - $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath - $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath + $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath $WindowsPdbVerificationParam + $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath $WindowsPdbVerificationParam - Write-Host -NoNewLine "`t Checking file " $FileName "... " + Write-Host -NoNewLine "`t Checking file " $FileName "... " - if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { - Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)" + if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) { + Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)" + } + else { + $MissingSymbols++ + + if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { + Write-Host 'No symbols found on MSDL or SymWeb!' } else { - $MissingSymbols++ - - if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) { - Write-Host 'No symbols found on MSDL or SymWeb!' + if ($SymbolsOnMSDL -eq $null) { + Write-Host 'No symbols found on MSDL!' } else { - if ($SymbolsOnMSDL -eq $null) { - Write-Host 'No symbols found on MSDL!' - } - else { - Write-Host 'No symbols found on SymWeb!' - } + Write-Host 'No symbols found on SymWeb!' } } } + } if ($using:Clean) { Remove-Item $ExtractPath -Recurse -Force @@ -168,16 +176,16 @@ $CountMissingSymbols = { Pop-Location return [pscustomobject]@{ - result = $MissingSymbols - packagePath = $PackagePath - } + result = $MissingSymbols + packagePath = $PackagePath + } } function CheckJobResult( - $result, - $packagePath, - [ref]$DupedSymbols, - [ref]$TotalFailures) { + $result, + $packagePath, + [ref]$DupedSymbols, + [ref]$TotalFailures) { if ($result -eq $ERROR_BADEXTRACT) { Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files" $DupedSymbols.Value++ @@ -222,7 +230,7 @@ function CheckSymbolsAvailable { return } - Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null + Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null $NumJobs = @(Get-Job -State 'Running').Count diff --git a/global.json b/global.json index c236486854418..1e18c8d9f1f7d 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21228.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21228.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21228.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21228.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21229.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21229.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21229.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21229.1", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21226.1" From c7df27e9f6893ac0a0e7409487b2028a4d5066a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 May 2021 12:11:49 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/arcade build 20210430.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21222.1 -> To Version 6.0.0-beta.21230.2 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- global.json | 8 ++--- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d12302029235..3cb32703b49cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -206,9 +206,9 @@ https://github.com/dotnet/xharness da00b833408e130d3df1e61d99e37655c4b41510 - + https://github.com/dotnet/arcade - 67f4230b38092d53d8f8d3a37301feb997adf26c + 46ad27d3cc557f2b84ce30b2c4e27438526dc91d diff --git a/eng/Versions.props b/eng/Versions.props index b419d33d81646..3ca554d7e759b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,19 +54,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 2.5.1-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 - 6.0.0-beta.21229.1 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 2.5.1-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 + 6.0.0-beta.21230.2 5.9.0-preview.2 diff --git a/global.json b/global.json index 1e18c8d9f1f7d..68d4f7ed29a31 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21229.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21229.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21229.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21229.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21230.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21230.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21230.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21230.2", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21226.1" From c5476d5289db9c71db9e2462e7ac71ca019ec105 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 May 2021 12:39:51 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/xharness build 20210430.4 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21227.1 -> To Version 1.0.0-prerelease.21230.4 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index fb2752cc154a5..9871f1f99aa41 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21229.3", + "version": "1.0.0-prerelease.21230.4", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cb32703b49cb..07aae28f27790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,13 +198,13 @@ https://github.com/mono/linker 1dfcf3077aca1ea77850f409d95c3192f03507b3 - + https://github.com/dotnet/xharness - da00b833408e130d3df1e61d99e37655c4b41510 + d78c6aaaa73bbfad500e06a1aec9385fde5bfc4a - + https://github.com/dotnet/xharness - da00b833408e130d3df1e61d99e37655c4b41510 + d78c6aaaa73bbfad500e06a1aec9385fde5bfc4a https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3ca554d7e759b..04238bad08692 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,8 +153,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21229.3 - 1.0.0-prerelease.21229.3 + 1.0.0-prerelease.21230.4 + 1.0.0-prerelease.21230.4 2.4.1 2.4.2 1.3.0 From 9356d555a12e39a68753ceb4c7a72d6d3f7d8621 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 May 2021 12:40:29 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/runtime-assets build 20210430.1 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21226.1 -> To Version 6.0.0-beta.21230.1 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07aae28f27790..52eee4e3d0b0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,41 +94,41 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/runtime-assets - 2d540b5877a2de3d774cef4a6934b6f628b4f69f + 15f1cd8ebde52c383c202732777fb20c2e743239 https://github.com/dotnet/llvm-project diff --git a/eng/Versions.props b/eng/Versions.props index 04238bad08692..28eeeccbb3805 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,15 +112,15 @@ 4.3.0 6.0.0-preview.5.21226.1 - 6.0.0-beta.21226.1 - 6.0.0-beta.21226.1 - 6.0.0-beta.21226.1 - 6.0.0-beta.21226.1 - 6.0.0-beta.21226.1 - 6.0.0-beta.21226.1 - 6.0.0-beta.21226.1 - 6.0.0-beta.21226.1 - 6.0.0-beta.21226.1 + 6.0.0-beta.21230.1 + 6.0.0-beta.21230.1 + 6.0.0-beta.21230.1 + 6.0.0-beta.21230.1 + 6.0.0-beta.21230.1 + 6.0.0-beta.21230.1 + 6.0.0-beta.21230.1 + 6.0.0-beta.21230.1 + 6.0.0-beta.21230.1 99.99.99-master-20210415.12 99.99.99-master-20210415.12 From 5ec2614bff6cd8ed742a3126562efe65fef924d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 May 2021 12:11:37 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/runtime build 20210503.1 Microsoft.NETCore.ILAsm , Microsoft.NETCore.DotNetHost , Microsoft.NETCore.DotNetHostPolicy , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Runtime.CompilerServices.Unsafe , System.Text.Json From Version 6.0.0-preview.5.21226.1 -> To Version 6.0.0-preview.5.21253.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52eee4e3d0b0b..622bc5698cc36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,33 +166,33 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 3782e6e41cfaf76ec9ae4117722f835596026b1a + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - 3782e6e41cfaf76ec9ae4117722f835596026b1a + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - 3782e6e41cfaf76ec9ae4117722f835596026b1a + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - 3782e6e41cfaf76ec9ae4117722f835596026b1a + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - 3782e6e41cfaf76ec9ae4117722f835596026b1a + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - 3782e6e41cfaf76ec9ae4117722f835596026b1a + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 - + https://github.com/dotnet/runtime - 3782e6e41cfaf76ec9ae4117722f835596026b1a + e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 28eeeccbb3805..2823de8abb59a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,11 +71,11 @@ 5.9.0-preview.2 6.0.0-alpha.1.20612.4 - 6.0.0-preview.5.21226.1 - 6.0.0-preview.5.21226.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 3.1.0 - 6.0.0-preview.5.21226.1 + 6.0.0-preview.5.21253.1 1.2.0-beta.304 4.5.1 @@ -103,14 +103,14 @@ 4.7.0 4.7.0 4.7.0 - 6.0.0-preview.5.21226.1 - 6.0.0-preview.5.21226.1 + 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21253.1 4.3.0 4.5.4 4.5.0 1.1.1 4.3.0 - 6.0.0-preview.5.21226.1 + 6.0.0-preview.5.21253.1 6.0.0-beta.21230.1 6.0.0-beta.21230.1 diff --git a/global.json b/global.json index 68d4f7ed29a31..abcf359ba2869 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21230.2", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21226.1" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21253.1" } } From c25014b51b7a9d0b438f0e068d741cb6ef6d4778 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 May 2021 12:13:05 +0000 Subject: [PATCH 09/14] Update dependencies from https://github.com/dotnet/arcade build 20210503.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21222.1 -> To Version 6.0.0-beta.21253.2 --- eng/Version.Details.xml | 68 +++++++++---------- eng/Versions.props | 26 +++---- .../post-build/sourcelink-validation.ps1 | 2 +- eng/common/post-build/symbols-validation.ps1 | 2 +- global.json | 8 +-- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 622bc5698cc36..9b3f4760e6935 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -206,9 +206,9 @@ https://github.com/dotnet/xharness d78c6aaaa73bbfad500e06a1aec9385fde5bfc4a - + https://github.com/dotnet/arcade - 46ad27d3cc557f2b84ce30b2c4e27438526dc91d + e9fd640e1ec1890489ea66ad0f59e733448056da diff --git a/eng/Versions.props b/eng/Versions.props index 2823de8abb59a..30a11f4a29e15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,19 +54,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 2.5.1-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 - 6.0.0-beta.21230.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 2.5.1-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 + 6.0.0-beta.21253.2 5.9.0-preview.2 diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 1c46f7b634148..8c554729b612d 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -14,7 +14,7 @@ param( $global:RepoFiles = @{} # Maximum number of jobs to run in parallel -$MaxParallelJobs = 6 +$MaxParallelJobs = 16 # Wait time between check for system load $SecondsBetweenLoadChecks = 10 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index e6d5d2fd05455..788321d773d60 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -8,7 +8,7 @@ param( ) # Maximum number of jobs to run in parallel -$MaxParallelJobs = 6 +$MaxParallelJobs = 16 # Max number of retries $MaxRetry = 5 diff --git a/global.json b/global.json index abcf359ba2869..99f97276420fb 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21230.2", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21230.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21230.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21230.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21253.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21253.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21253.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21253.2", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21253.1" From 444be3d8d097a1cff26c02ba961ff5a9ee95cab0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 May 2021 12:34:09 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/icu build 20210503.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-preview.5.21226.1 -> To Version 6.0.0-preview.5.21253.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b3f4760e6935..c96fe4120cc93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 1506ee5e15b24023af8dbe798b8529bd2ca599d6 + 2b360359e8a3496d7c80a3bffb6a7b626d51f54c diff --git a/eng/Versions.props b/eng/Versions.props index 30a11f4a29e15..3b2a2336b46d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,7 +167,7 @@ 6.0.100-preview.2.21226.1 - 6.0.0-preview.5.21226.1 + 6.0.0-preview.5.21253.1 9.0.1-alpha.1.21226.1 9.0.1-alpha.1.21226.1 From 1e5906e3851232ab0e5717502b404b350ef695c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 May 2021 12:34:46 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/xharness build 20210503.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21227.1 -> To Version 1.0.0-prerelease.21253.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9871f1f99aa41..aebb5f6d3959e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21230.4", + "version": "1.0.0-prerelease.21253.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c96fe4120cc93..acd6cac351350 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,13 +198,13 @@ https://github.com/mono/linker 1dfcf3077aca1ea77850f409d95c3192f03507b3 - + https://github.com/dotnet/xharness - d78c6aaaa73bbfad500e06a1aec9385fde5bfc4a + e60d63ce90760ec57ea43fbc2d0f7b3dd291eb5c - + https://github.com/dotnet/xharness - d78c6aaaa73bbfad500e06a1aec9385fde5bfc4a + e60d63ce90760ec57ea43fbc2d0f7b3dd291eb5c https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3b2a2336b46d6..4628372ce2506 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,8 +153,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21230.4 - 1.0.0-prerelease.21230.4 + 1.0.0-prerelease.21253.2 + 1.0.0-prerelease.21253.2 2.4.1 2.4.2 1.3.0 From 924fd07d2535f2804eea5d423c61e4344b5a71ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 May 2021 12:35:23 +0000 Subject: [PATCH 12/14] Update dependencies from https://github.com/dotnet/llvm-project build 20210503.1 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 9.0.1-alpha.1.21226.1 -> To Version 9.0.1-alpha.1.21253.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acd6cac351350..4f799f4ebef4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -130,37 +130,37 @@ https://github.com/dotnet/runtime-assets 15f1cd8ebde52c383c202732777fb20c2e743239 - + https://github.com/dotnet/llvm-project - 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4 + 324e6cfdeead35f665de6e0833b414c56a34a258 - + https://github.com/dotnet/llvm-project - 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4 + 324e6cfdeead35f665de6e0833b414c56a34a258 - + https://github.com/dotnet/llvm-project - 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4 + 324e6cfdeead35f665de6e0833b414c56a34a258 - + https://github.com/dotnet/llvm-project - 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4 + 324e6cfdeead35f665de6e0833b414c56a34a258 - + https://github.com/dotnet/llvm-project - 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4 + 324e6cfdeead35f665de6e0833b414c56a34a258 - + https://github.com/dotnet/llvm-project - 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4 + 324e6cfdeead35f665de6e0833b414c56a34a258 - + https://github.com/dotnet/llvm-project - 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4 + 324e6cfdeead35f665de6e0833b414c56a34a258 - + https://github.com/dotnet/llvm-project - 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4 + 324e6cfdeead35f665de6e0833b414c56a34a258 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4628372ce2506..8400d4682968b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,14 +169,14 @@ 6.0.0-preview.5.21253.1 - 9.0.1-alpha.1.21226.1 - 9.0.1-alpha.1.21226.1 - 9.0.1-alpha.1.21226.1 - 9.0.1-alpha.1.21226.1 - 9.0.1-alpha.1.21226.1 - 9.0.1-alpha.1.21226.1 - 9.0.1-alpha.1.21226.1 - 9.0.1-alpha.1.21226.1 + 9.0.1-alpha.1.21253.1 + 9.0.1-alpha.1.21253.1 + 9.0.1-alpha.1.21253.1 + 9.0.1-alpha.1.21253.1 + 9.0.1-alpha.1.21253.1 + 9.0.1-alpha.1.21253.1 + 9.0.1-alpha.1.21253.1 + 9.0.1-alpha.1.21253.1 From 8ce5b774d4cdcbddfdccff4136acbba99ce49c29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 May 2021 12:12:59 +0000 Subject: [PATCH 13/14] Update dependencies from https://github.com/dotnet/arcade build 20210504.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageValidation , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21222.1 -> To Version 6.0.0-beta.21254.3 --- eng/Version.Details.xml | 68 ++++++++++++------------ eng/Versions.props | 26 ++++----- eng/common/cross/build-rootfs.sh | 4 ++ eng/common/templates/job/onelocbuild.yml | 2 + global.json | 8 +-- 5 files changed, 57 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f799f4ebef4d..6107c01206070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -206,9 +206,9 @@ https://github.com/dotnet/xharness e60d63ce90760ec57ea43fbc2d0f7b3dd291eb5c - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 diff --git a/eng/Versions.props b/eng/Versions.props index 8400d4682968b..be8fc0220a0c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,19 +54,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 2.5.1-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 2.5.1-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 5.9.0-preview.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 81e641a57b53d..df0dfa5781cde 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -78,6 +78,10 @@ __IllumosPackages+=" openssl-1.1.1e" __IllumosPackages+=" zlib-1.2.11" __IllumosPackages+=" openldap-client-2.4.49" +# ML.NET dependencies +__UbuntuPackages+=" libomp5" +__UbuntuPackages+=" libomp-dev" + __UseMirror=0 __UnprocessedBuildArgs= diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index b27d6faf3035d..958db4064cf02 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,6 +12,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo @@ -59,6 +60,7 @@ jobs: isCreatePrSelected: ${{ parameters.CreatePr }} ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/global.json b/global.json index 99f97276420fb..4c3971716b75b 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21253.2", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21253.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21253.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21253.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21254.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21254.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21254.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21254.3", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21253.1" From 85739a8f954e6760704f34b40268cc9e16ded343 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 May 2021 13:10:42 +0000 Subject: [PATCH 14/14] Update dependencies from https://github.com/dotnet/xharness build 20210504.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21227.1 -> To Version 1.0.0-prerelease.21254.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index aebb5f6d3959e..05eaade4ca1b9 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21253.2", + "version": "1.0.0-prerelease.21254.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6107c01206070..916824df58bb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,13 +198,13 @@ https://github.com/mono/linker 1dfcf3077aca1ea77850f409d95c3192f03507b3 - + https://github.com/dotnet/xharness - e60d63ce90760ec57ea43fbc2d0f7b3dd291eb5c + 89cb4b1d368e0f15b4df8e02a176dd1f1c33958b - + https://github.com/dotnet/xharness - e60d63ce90760ec57ea43fbc2d0f7b3dd291eb5c + 89cb4b1d368e0f15b4df8e02a176dd1f1c33958b https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index be8fc0220a0c4..49d02fbf45287 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,8 +153,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21253.2 - 1.0.0-prerelease.21253.2 + 1.0.0-prerelease.21254.2 + 1.0.0-prerelease.21254.2 2.4.1 2.4.2 1.3.0