Skip to content

Commit b883eba

Browse files
dotnet-maestro[bot]dougbu
authored andcommitted
[release/3.0-preview9] Update dependencies from 4 repositories (#13753)
* Update dependencies from https://github.com/dotnet/arcade build 20190906.10 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19456.10 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19456.10 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190906.6 - Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19456.6 - Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19456.6 - Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19456.6 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19456.6 * Update dependencies from https://github.com/aspnet/Blazor build 20190906.1 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19456.1 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190906.14 - Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19456.14 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19456.14 - dotnet-ef - 3.0.0-rc1.19456.14 - Microsoft.EntityFrameworkCore - 3.0.0-rc1.19456.14 - Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19456.14 - Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19456.14 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19456.14 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Bcl.AsyncInterfaces - 1.0.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19456-20 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.CSharp - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.Registry - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.SystemEvents - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Drawing.Common - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.Http.WinHttpHandler - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.WebSockets.WebSocketProtocol - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 1.7.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Pkcs - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Permissions - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Principal.Windows - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Threading.Channels - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Windows.Extensions - 4.6.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19456-20 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.0-rc1-19456-20 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0-rc1-19456-20 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.0-rc1.19456.4 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.0-rc1.19456.10 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19454-05 (parent: Microsoft.Extensions.Logging)
1 parent a37a2b0 commit b883eba

20 files changed

+824
-656
lines changed

eng/Version.Details.xml

Lines changed: 208 additions & 208 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 102 additions & 102 deletions
Large diffs are not rendered by default.

eng/common/build.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ function Build {
8585
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
8686
# Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty.
8787
[string[]] $msbuildArgs = $properties
88+
89+
# Resolve relative project paths into full paths
90+
$projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';')
91+
8892
$msbuildArgs += "/p:Projects=$projects"
8993
$properties = $msbuildArgs
9094
}

eng/common/performance/performance-setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Param(
1717
[string] $Configurations="CompilationMode=$CompilationMode"
1818
)
1919

20-
$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance")
20+
$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance")
2121
$UseCoreRun = ($CoreRootDirectory -ne [string]::Empty)
2222
$UseBaselineCoreRun = ($BaselineCoreRootDirectory -ne [string]::Empty)
2323

eng/common/performance/performance-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ while (($# > 0)); do
113113
esac
114114
done
115115

116-
if [[ "$repository" == "dotnet/performance" ]]; then
116+
if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-performance" ]; then
117117
run_from_perf_repo=true
118118
fi
119119

eng/common/sdl/execute-all-sdl-tools.ps1

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ if ($GuardianPackageName) {
4545
$guardianCliLocation = $GuardianCliLocation
4646
}
4747

48+
$workingDirectory = (Split-Path $SourceDirectory -Parent)
4849
$ValidPath = Test-Path $guardianCliLocation
4950

5051
if ($ValidPath -eq $False)
@@ -53,13 +54,13 @@ if ($ValidPath -eq $False)
5354
exit 1
5455
}
5556

56-
& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory (Split-Path $SourceDirectory -Parent) -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
57-
$gdnFolder = Join-Path (Split-Path $SourceDirectory -Parent) ".gdn"
57+
& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
58+
$gdnFolder = Join-Path $workingDirectory ".gdn"
5859

5960
if ($TsaOnboard) {
6061
if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) {
61-
Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel"
62-
& $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel
62+
Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel"
63+
& $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
6364
if ($LASTEXITCODE -ne 0) {
6465
Write-Host "Guardian tsa-onboard failed with exit code $LASTEXITCODE."
6566
exit $LASTEXITCODE
@@ -71,10 +72,10 @@ if ($TsaOnboard) {
7172
}
7273

7374
if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) {
74-
& $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
75+
& $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
7576
}
7677
if ($SourceToolsList -and $SourceToolsList.Count -gt 0) {
77-
& $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
78+
& $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
7879
}
7980

8081
if ($UpdateBaseline) {
@@ -86,8 +87,8 @@ if ($TsaPublish) {
8687
if (-not $TsaRepositoryName) {
8788
$TsaRepositoryName = "$($Repository)-$($BranchName)"
8889
}
89-
Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel"
90-
& $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel
90+
Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel"
91+
& $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel
9192
if ($LASTEXITCODE -ne 0) {
9293
Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE."
9394
exit $LASTEXITCODE

eng/common/templates/job/job.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ parameters:
2424

2525
workspace: ''
2626

27-
# Job base template specific parameters
27+
# Job base template specific parameters
2828
# Optional: Enable installing Microbuild plugin
2929
# if 'true', these "variables" must be specified in the variables object or as part of the queue matrix
3030
# _TeamName - the name of your team
@@ -151,6 +151,9 @@ jobs:
151151
continueOnError: ${{ parameters.continueOnError }}
152152
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
153153

154+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
155+
- task: NuGetAuthenticate@0
156+
154157
- ${{ each step in parameters.steps }}:
155158
- ${{ step }}
156159

eng/common/templates/job/performance.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ parameters:
55
displayName: '' # optional -- display name for the job. Will use jobName if not passed
66
pool: '' # required -- name of the Build pool
77
container: '' # required -- name of the container
8+
osGroup: '' # required -- operating system for the job
89
extraSetupParameters: '' # optional -- extra arguments to pass to the setup script
910
frameworks: ['netcoreapp3.0'] # optional -- list of frameworks to run against
1011
continueOnError: 'false' # optional -- determines whether to continue the build if the step errors
@@ -44,12 +45,13 @@ jobs:
4445
- HelixPreCommand: ''
4546

4647
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
47-
- ${{ if eq(variables['Agent.Os'], 'Windows_NT') }}:
48+
- ${{ if eq( parameters.osGroup, 'Windows_NT') }}:
4849
- HelixPreCommand: 'set "PERFLAB_UPLOAD_TOKEN=$(PerfCommandUploadToken)"'
4950
- IsInternal: -Internal
50-
- ${{ if ne(variables['Agent.Os'], 'Windows_NT') }}:
51+
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
5152
- HelixPreCommand: 'export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"'
5253
- IsInternal: --internal
54+
5355
- group: DotNet-HelixApi-Access
5456
- group: dotnet-benchview
5557

eng/common/templates/job/publish-build-assets.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
downloadPath: '$(Build.StagingDirectory)/Download'
4848
condition: ${{ parameters.condition }}
4949
continueOnError: ${{ parameters.continueOnError }}
50+
51+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
52+
- task: NuGetAuthenticate@0
53+
5054
- task: PowerShell@2
5155
displayName: Publish Build Assets
5256
inputs:
@@ -59,6 +63,7 @@ jobs:
5963
/p:Configuration=$(_BuildConfig)
6064
condition: ${{ parameters.condition }}
6165
continueOnError: ${{ parameters.continueOnError }}
66+
6267
- task: powershell@2
6368
displayName: Create ReleaseConfigs Artifact
6469
inputs:
@@ -67,12 +72,14 @@ jobs:
6772
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
6873
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
6974
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
75+
7076
- task: PublishBuildArtifacts@1
7177
displayName: Publish ReleaseConfigs Artifact
7278
inputs:
7379
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
7480
PublishLocation: Container
7581
ArtifactName: ReleaseConfigs
82+
7683
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
7784
- task: PublishBuildArtifacts@1
7885
displayName: Publish Logs to VSTS
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
parameters:
2-
enableSymbolValidation: true
32
symbolPublishingAdditionalParameters: ''
43
artifactsPublishingAdditionalParameters: ''
54
publishInstallersAndChecksums: false
65

76
stages:
8-
- stage: Publish
7+
- stage: NetCore_Dev30_Publish
98
dependsOn: validate
109
variables:
1110
- template: ../common-variables.yml
12-
displayName: Developer Channel
11+
displayName: .NET Core 3.0 Dev Publishing
1312
jobs:
1413
- template: ../setup-maestro-vars.yml
1514

@@ -39,15 +38,15 @@ stages:
3938
inputs:
4039
filePath: eng\common\sdk-task.ps1
4140
arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
42-
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
43-
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
41+
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
42+
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
4443
/p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
4544
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
4645
/p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
4746
/p:Configuration=Release
4847
${{ parameters.symbolPublishingAdditionalParameters }}
4948

50-
- job:
49+
- job: publish_assets
5150
displayName: Publish Assets
5251
dependsOn: setupMaestroVars
5352
variables:
@@ -79,22 +78,33 @@ stages:
7978
buildType: current
8079
artifactName: AssetManifests
8180

81+
- task: NuGetToolInstaller@1
82+
displayName: 'Install NuGet.exe'
83+
84+
# This is necessary whenever we want to publish/restore to an AzDO private feed
85+
- task: NuGetAuthenticate@0
86+
displayName: 'Authenticate to AzDO Feeds'
87+
8288
- task: PowerShell@2
83-
displayName: Add Assets Location
89+
displayName: Publish Assets
8490
env:
85-
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
91+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
8692
inputs:
8793
filePath: eng\common\sdk-task.ps1
8894
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
89-
/p:ChannelId=$(PublicDevRelease_30_Channel_Id)
9095
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
9196
/p:IsStableBuild=$(IsStableBuild)
9297
/p:IsInternalBuild=$(IsInternalBuild)
9398
/p:RepositoryName=$(Build.Repository.Name)
9499
/p:CommitSha=$(Build.SourceVersion)
95-
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
96-
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
97-
/p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)'
100+
/p:StaticInternalFeed=$(StaticInternalFeed)
101+
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
102+
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
103+
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
104+
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
105+
/p:NugetPath=$(NuGetExeToolPath)
106+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
107+
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
98108
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
99109
/p:BARBuildId=$(BARBuildId)
100110
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
@@ -109,57 +119,15 @@ stages:
109119
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
110120
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
111121
${{ parameters.artifactsPublishingAdditionalParameters }}
112-
113-
- task: NuGetCommand@2
114-
displayName: Publish Packages to AzDO Feed
115-
condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com')
116-
inputs:
117-
command: push
118-
vstsFeed: $(AzDoFeedName)
119-
packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg
120-
publishVstsFeed: $(AzDoFeedName)
121-
122-
- task: PowerShell@2
123-
displayName: Publish Blobs to AzDO Feed
124-
inputs:
125-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1
126-
arguments: -FeedName $(AzDoFeedName)
127-
-SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/
128-
-PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw)
129-
enabled: false
130122

131123

132-
- stage: PublishValidation
133-
displayName: Publish Validation
124+
- stage: NetCore_Dev30_Publish_Validation
125+
displayName: .NET Core 3.0 Dev Publish Validation
134126
variables:
135-
- template: ../common-variables.yml
127+
- template: ../common-variables.yml
136128
jobs:
137129
- template: ../setup-maestro-vars.yml
138130

139-
- ${{ if eq(parameters.enableSymbolValidation, 'true') }}:
140-
- job:
141-
displayName: Symbol Availability
142-
dependsOn: setupMaestroVars
143-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id))
144-
pool:
145-
vmImage: 'windows-2019'
146-
steps:
147-
- task: DownloadBuildArtifacts@0
148-
displayName: Download Package Artifacts
149-
inputs:
150-
buildType: current
151-
artifactName: PackageArtifacts
152-
153-
- task: PowerShell@2
154-
displayName: Check Symbol Availability
155-
inputs:
156-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
157-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
158-
159-
- template: ../darc-gather-drop.yml
131+
- template: ../promote-build.yml
160132
parameters:
161133
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}
162-
163-
- template: ../promote-build.yml
164-
parameters:
165-
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

0 commit comments

Comments
 (0)