Skip to content

Commit

Permalink
[master] Update dependencies from aspnet/Extensions dotnet/arcade (#1…
Browse files Browse the repository at this point in the history
…6123)

* Update dependencies from https://github.com/aspnet/Extensions build 20190616.2

- Microsoft.Extensions.DependencyInjection - 3.0.0-preview7.19316.2
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview7.19316.2
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview7.19316.2
- Microsoft.Extensions.Configuration - 3.0.0-preview7.19316.2
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview7.19316.2
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview7.19316.2
- Microsoft.Extensions.Logging - 3.0.0-preview7.19316.2

* Update dependencies from https://github.com/dotnet/arcade build 20190615.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19315.2

* Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.DotNet.PlatformAbstractions - 3.0.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview7-27816-03 (parent: Microsoft.Extensions.Logging)
  • Loading branch information
dotnet-maestro[bot] authored Jun 17, 2019
1 parent f9d1df4 commit f313600
Show file tree
Hide file tree
Showing 19 changed files with 1,107 additions and 195 deletions.
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,57 +5,57 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0-preview7-27815-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.0.0-preview7-27816-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>5bfe8af80b4c286350f892586ba4fbdabfdad8a2</Sha>
<Sha>c36106d9b5fdcd198041b1c77dac0bd8cd485f98</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview7.19315.3">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview7.19316.2">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>aedba48f269e03db2b9a626b9a04aa8bde4bfe72</Sha>
<Sha>5aec44060846a0f99893507ff3d7188ade39e8af</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview7.19315.3">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview7.19316.2">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>aedba48f269e03db2b9a626b9a04aa8bde4bfe72</Sha>
<Sha>5aec44060846a0f99893507ff3d7188ade39e8af</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview7.19315.3">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview7.19316.2">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>aedba48f269e03db2b9a626b9a04aa8bde4bfe72</Sha>
<Sha>5aec44060846a0f99893507ff3d7188ade39e8af</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview7.19315.3">
<Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview7.19316.2">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>aedba48f269e03db2b9a626b9a04aa8bde4bfe72</Sha>
<Sha>5aec44060846a0f99893507ff3d7188ade39e8af</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview7.19315.3">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview7.19316.2">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>aedba48f269e03db2b9a626b9a04aa8bde4bfe72</Sha>
<Sha>5aec44060846a0f99893507ff3d7188ade39e8af</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview7-27815-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview7-27816-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>5bfe8af80b4c286350f892586ba4fbdabfdad8a2</Sha>
<Sha>c36106d9b5fdcd198041b1c77dac0bd8cd485f98</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview7.19315.3">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview7.19316.2">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>aedba48f269e03db2b9a626b9a04aa8bde4bfe72</Sha>
<Sha>5aec44060846a0f99893507ff3d7188ade39e8af</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview7.19315.3">
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview7.19316.2">
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>aedba48f269e03db2b9a626b9a04aa8bde4bfe72</Sha>
<Sha>5aec44060846a0f99893507ff3d7188ade39e8af</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5955ee2583d4509d37ecf55243e9e3c9af128487</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview7-27815-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.0.0-preview7-27816-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>5bfe8af80b4c286350f892586ba4fbdabfdad8a2</Sha>
<Sha>c36106d9b5fdcd198041b1c77dac0bd8cd485f98</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview7-27815-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.0.0-preview7-27816-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>5bfe8af80b4c286350f892586ba4fbdabfdad8a2</Sha>
<Sha>c36106d9b5fdcd198041b1c77dac0bd8cd485f98</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview7-27815-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview7-27816-03" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>5bfe8af80b4c286350f892586ba4fbdabfdad8a2</Sha>
<Sha>c36106d9b5fdcd198041b1c77dac0bd8cd485f98</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="1.6.0-preview7.19313.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand All @@ -71,9 +71,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19309.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19315.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45361625125cdd3119050a852bd73163ca4b73f4</Sha>
<Sha>aa4285be7fab64e2b6e62e4d5688ea50931c407c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
24 changes: 12 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
<MicrosoftDataSqlClientPackageVersion>1.0.19128.1-Preview</MicrosoftDataSqlClientPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from aspnet/Extensions">
<MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview7.19315.3</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview7.19315.3</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview7.19315.3</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview7.19315.3</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview7.19315.3</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview7.19315.3</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview7.19315.3</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview7.19316.2</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview7.19316.2</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview7.19316.2</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview7.19316.2</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview7.19316.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview7.19316.2</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview7.19316.2</MicrosoftExtensionsLoggingPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/corefx">
<MicrosoftCSharpPackageVersion>4.6.0-preview7.19313.2</MicrosoftCSharpPackageVersion>
Expand All @@ -44,11 +44,11 @@
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview7.19313.2</SystemDiagnosticsDiagnosticSourcePackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/core-setup">
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview7-27815-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview7-27815-03</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview7-27815-03</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview7-27815-03</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview7-27815-03</NETStandardLibraryRefPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview7-27816-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview7-27816-03</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview7-27816-03</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.0.0-preview7-27816-03</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview7-27816-03</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--
Expand Down
2 changes: 1 addition & 1 deletion eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ try {
}
catch {
Write-Host $_.ScriptStackTrace
Write-PipelineTaskError -Message $_
Write-PipelineTelemetryError -Category "InitializeToolset" -Message $_
ExitWithExitCode 1
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1
# Source for this file was taken from https://github.com/microsoft/azure-pipelines-task-lib/blob/11c9439d4af17e6475d9fe058e6b2e03914d17e6/powershell/VstsTaskSdk/LoggingCommandFunctions.ps1 and modified.

# NOTE: You should not be calling these method directly as they are likely to change. Instead you should be calling the Write-Pipeline* functions defined in tools.ps1

Expand All @@ -12,6 +12,93 @@ $script:loggingCommandEscapeMappings = @( # TODO: WHAT ABOUT "="? WHAT ABOUT "%"
# TODO: BUG: Escape % ???
# TODO: Add test to verify don't need to escape "=".

function Write-PipelineTelemetryError {
[CmdletBinding()]
param(
[Parameter(Mandatory = $true)]
[string]$Category,
[Parameter(Mandatory = $true)]
[string]$Message,
[Parameter(Mandatory = $false)]
[string]$Type = 'error',
[string]$ErrCode,
[string]$SourcePath,
[string]$LineNumber,
[string]$ColumnNumber,
[switch]$AsOutput)

$PSBoundParameters.Remove("Category") | Out-Null

$Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message"
$PSBoundParameters.Remove("Message") | Out-Null
$PSBoundParameters.Add("Message", $Message)

Write-PipelineTaskError @PSBoundParameters
}

function Write-PipelineTaskError {
[CmdletBinding()]
param(
[Parameter(Mandatory = $true)]
[string]$Message,
[Parameter(Mandatory = $false)]
[string]$Type = 'error',
[string]$ErrCode,
[string]$SourcePath,
[string]$LineNumber,
[string]$ColumnNumber,
[switch]$AsOutput)

if(!$ci) {
if($Type -eq 'error') {
Write-Host $Message -ForegroundColor Red
return
}
elseif ($Type -eq 'warning') {
Write-Host $Message -ForegroundColor Yellow
return
}
}

if(($Type -ne 'error') -and ($Type -ne 'warning')) {
Write-Host $Message
return
}
if(-not $PSBoundParameters.ContainsKey('Type')) {
$PSBoundParameters.Add('Type', 'error')
}
Write-LogIssue @PSBoundParameters
}

function Write-PipelineSetVariable {
[CmdletBinding()]
param(
[Parameter(Mandatory = $true)]
[string]$Name,
[string]$Value,
[switch]$Secret,
[switch]$AsOutput)

if($ci) {
Write-LoggingCommand -Area 'task' -Event 'setvariable' -Data $Value -Properties @{
'variable' = $Name
'isSecret' = $Secret
'isOutput' = 'true'
} -AsOutput:$AsOutput
}
}

function Write-PipelinePrependPath {
[CmdletBinding()]
param(
[Parameter(Mandatory=$true)]
[string]$Path,
[switch]$AsOutput)
if($ci) {
Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput
}
}

<########################################
# Private functions.
########################################>
Expand Down
102 changes: 102 additions & 0 deletions eng/common/pipeline-logging-functions.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
#!/usr/bin/env bash

function Write-PipelineTelemetryError {
local telemetry_category=''
local function_args=()
local message=''
while [[ $# -gt 0 ]]; do
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
case "$opt" in
-category|-c)
telemetry_category=$2
shift
;;
-*)
function_args+=("$1 $2")
shift
;;
*)
message=$*
;;
esac
shift
done

if [[ "$ci" != true ]]; then
echo "$message" >&2
return
fi

message="(NETCORE_ENGINEERING_TELEMETRY=$telemetry_category) $message"
function_args+=("$message")

Write-PipelineTaskError $function_args
}

function Write-PipelineTaskError {
if [[ "$ci" != true ]]; then
echo "$@" >&2
return
fi

message_type="error"
sourcepath=''
linenumber=''
columnnumber=''
error_code=''

while [[ $# -gt 0 ]]; do
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
case "$opt" in
-type|-t)
message_type=$2
shift
;;
-sourcepath|-s)
sourcepath=$2
shift
;;
-linenumber|-ln)
linenumber=$2
shift
;;
-columnnumber|-cn)
columnnumber=$2
shift
;;
-errcode|-e)
error_code=$2
shift
;;
*)
break
;;
esac

shift
done

message="##vso[task.logissue"

message="$message type=$message_type"

if [ -n "$sourcepath" ]; then
message="$message;sourcepath=$sourcepath"
fi

if [ -n "$linenumber" ]; then
message="$message;linenumber=$linenumber"
fi

if [ -n "$columnnumber" ]; then
message="$message;columnnumber=$columnnumber"
fi

if [ -n "$error_code" ]; then
message="$message;code=$error_code"
fi

message="$message]$*"
echo "$message"
}

29 changes: 29 additions & 0 deletions eng/common/post-build/dotnetsymbol-init.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
param (
$dotnetsymbolVersion = $null
)

$ErrorActionPreference = "Stop"
Set-StrictMode -Version 2.0

. $PSScriptRoot\..\tools.ps1

$verbosity = "minimal"

function Installdotnetsymbol ($dotnetsymbolVersion) {
$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."
}
else {
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 $verbosity --global
}
}

Installdotnetsymbol $dotnetsymbolVersion
Loading

0 comments on commit f313600

Please sign in to comment.