From 7dba8ac057fc4a169d9383dc5437e8ee9b848d5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Aug 2019 12:19:53 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20190828.9 - Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19428.9 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19428.9 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19428.9 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19428.9 --- eng/Version.Details.xml | 16 +++++++-------- eng/Versions.props | 6 +++--- eng/common/post-build/symbols-validation.ps1 | 20 +++++++++---------- .../templates/post-build/common-variables.yml | 4 ++-- .../templates/post-build/post-build.yml | 4 ++-- global.json | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 232309afa6..3b74f1a3ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,21 +135,21 @@ - + https://github.com/dotnet/arcade - c02ca5d078b5b54bef8043d972082f41fd912190 + dc55bd4b7353be8e36b2f71b9557e84f743dd6f6 - + https://github.com/dotnet/arcade - c02ca5d078b5b54bef8043d972082f41fd912190 + dc55bd4b7353be8e36b2f71b9557e84f743dd6f6 - + https://github.com/dotnet/arcade - c02ca5d078b5b54bef8043d972082f41fd912190 + dc55bd4b7353be8e36b2f71b9557e84f743dd6f6 - + https://github.com/dotnet/arcade - c02ca5d078b5b54bef8043d972082f41fd912190 + dc55bd4b7353be8e36b2f71b9557e84f743dd6f6 https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index f2225f925e..ee07099e19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,9 +35,9 @@ - 2.2.0-beta.19427.8 - 1.0.0-beta.19427.8 - 1.0.0-beta.19427.8 + 2.2.0-beta.19428.9 + 1.0.0-beta.19428.9 + 1.0.0-beta.19428.9 1.0.0-beta2-19367-01 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index d5ec51b150..096ac321d1 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -37,10 +37,10 @@ function FirstMatchingSymbolDescriptionOrDefault { # DWARF file for a .dylib $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") - $dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools" - $dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe" + $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools" + $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe" - & $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null + & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null if (Test-Path $PdbPath) { return "PDB" @@ -159,25 +159,25 @@ function CheckSymbolsAvailable { } } -function Installdotnetsymbol { - $dotnetsymbolPackageName = "dotnet-symbol" +function InstallDotnetSymbol { + $dotnetSymbolPackageName = "dotnet-symbol" $dotnetRoot = InitializeDotNetCli -install:$true $dotnet = "$dotnetRoot\dotnet.exe" $toolList = & "$dotnet" tool list --global - if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) { - Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed." + if (($toolList -like "*$dotnetSymbolPackageName*") -and ($toolList -like "*$dotnetSymbolVersion*")) { + Write-Host "dotnet-symbol version $dotnetSymbolVersion is already installed." } else { - Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..." + Write-Host "Installing dotnet-symbol version $dotnetSymbolVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity "minimal" --global + & "$dotnet" tool install $dotnetSymbolPackageName --version $dotnetSymbolVersion --verbosity "minimal" --global } } try { - Installdotnetsymbol + InstallDotnetSymbol CheckSymbolsAvailable } diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b00d85d8ce..7b3fdb1361 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -49,6 +49,6 @@ variables: # Default locations for Installers and checksums - name: ChecksumsBlobFeedUrl - value: https://dotnetcli.blob.core.windows.net/dotnet/index.json - - name: InstallersBlobFeedUrl value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json + - name: InstallersBlobFeedUrl + value: https://dotnetcli.blob.core.windows.net/dotnet/index.json diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3f239fae2b..be92789acd 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,7 +1,7 @@ parameters: - enableSourceLinkValidation: true + enableSourceLinkValidation: false enableSigningValidation: true - enableSymbolValidation: true + enableSymbolValidation: false enableNugetValidation: true publishInstallersAndChecksums: false SDLValidationParameters: diff --git a/global.json b/global.json index 33b7add33c..efd9f5144e 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19427.8" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19428.9" } }