diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2019-08-29 14:40:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-29 14:40:04 +0000 |
commit | 91463c3df362961859c2ae64956de70a0a8bebba (patch) | |
tree | 45108487d14738e919f2ac5c8a8661b4a8376383 | |
parent | 410268b19f7b0b1b1215061f8891a82323ce5955 (diff) | |
download | coreclr-91463c3df362961859c2ae64956de70a0a8bebba.tar.gz coreclr-91463c3df362961859c2ae64956de70a0a8bebba.tar.bz2 coreclr-91463c3df362961859c2ae64956de70a0a8bebba.zip |
Update dependencies from https://github.com/dotnet/arcade build 20190828.9 (#26432)
- 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
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19428.9
-rw-r--r-- | eng/Version.Details.xml | 16 | ||||
-rw-r--r-- | eng/Versions.props | 4 | ||||
-rw-r--r-- | eng/common/post-build/symbols-validation.ps1 | 20 | ||||
-rw-r--r-- | eng/common/templates/post-build/common-variables.yml | 4 | ||||
-rw-r--r-- | eng/common/templates/post-build/post-build.yml | 4 | ||||
-rw-r--r-- | global.json | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2eecac035c..32350f84e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,21 +2,21 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19427.8"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19428.9"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c02ca5d078b5b54bef8043d972082f41fd912190</Sha> + <Sha>dc55bd4b7353be8e36b2f71b9557e84f743dd6f6</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19427.8"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19428.9"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c02ca5d078b5b54bef8043d972082f41fd912190</Sha> + <Sha>dc55bd4b7353be8e36b2f71b9557e84f743dd6f6</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19427.8"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19428.9"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c02ca5d078b5b54bef8043d972082f41fd912190</Sha> + <Sha>dc55bd4b7353be8e36b2f71b9557e84f743dd6f6</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19427.8"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19428.9"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>c02ca5d078b5b54bef8043d972082f41fd912190</Sha> + <Sha>dc55bd4b7353be8e36b2f71b9557e84f743dd6f6</Sha> </Dependency> <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc1.19420.10"> <Uri>https://github.com/dotnet/corefx</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 39b9fc02aa..671005e72f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,8 +15,8 @@ <UsingToolXliff>false</UsingToolXliff> <!-- Package versions --> <!-- arcade --> - <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19427.8</MicrosoftDotNetBuildTasksFeedVersion> - <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19427.8</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19428.9</MicrosoftDotNetBuildTasksFeedVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19428.9</MicrosoftDotNetBuildTasksPackagingVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion> <!-- roslyn --> <MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion> 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 f8d0c7fc1f..69999025f7 100644 --- a/global.json +++ b/global.json @@ -7,8 +7,8 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19427.8", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19427.8", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19428.9", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19428.9", "Microsoft.Build.NoTargets": "1.0.53", "Microsoft.Build.Traversal": "2.0.2" } |