Skip to content

Commit f28daf0

Browse files
dotnet-maestro[bot]baronfel
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20190906.10 (#7516)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10
1 parent 2a24020 commit f28daf0

14 files changed

Lines changed: 13 additions & 159 deletions

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19456.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19456.10">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>397060df67388da56b50de7e6f7292a5dccc2de6</Sha>
8+
<Sha>2d393243ba4a0c95c2c18aa266df6e0f43ffe22d</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

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/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/post-build/channels/netcore-dev-30.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
enableSymbolValidation: true
32
symbolPublishingAdditionalParameters: ''
43
artifactsPublishingAdditionalParameters: ''
54
publishInstallersAndChecksums: false
@@ -129,26 +128,6 @@ stages:
129128
jobs:
130129
- template: ../setup-maestro-vars.yml
131130

132-
- ${{ if eq(parameters.enableSymbolValidation, 'true') }}:
133-
- job:
134-
displayName: Symbol Availability
135-
dependsOn: setupMaestroVars
136-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id))
137-
pool:
138-
vmImage: 'windows-2019'
139-
steps:
140-
- task: DownloadBuildArtifacts@0
141-
displayName: Download Package Artifacts
142-
inputs:
143-
buildType: current
144-
artifactName: PackageArtifacts
145-
146-
- task: PowerShell@2
147-
displayName: Check Symbol Availability
148-
inputs:
149-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
150-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
151-
152131
- template: ../promote-build.yml
153132
parameters:
154133
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

eng/common/templates/post-build/channels/netcore-dev-31.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
enableSymbolValidation: true
32
symbolPublishingAdditionalParameters: ''
43
artifactsPublishingAdditionalParameters: ''
54
publishInstallersAndChecksums: false
@@ -129,26 +128,6 @@ stages:
129128
jobs:
130129
- template: ../setup-maestro-vars.yml
131130

132-
- ${{ if eq(parameters.enableSymbolValidation, 'true') }}:
133-
- job:
134-
displayName: Symbol Availability
135-
dependsOn: setupMaestroVars
136-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id))
137-
pool:
138-
vmImage: 'windows-2019'
139-
steps:
140-
- task: DownloadBuildArtifacts@0
141-
displayName: Download Package Artifacts
142-
inputs:
143-
buildType: current
144-
artifactName: PackageArtifacts
145-
146-
- task: PowerShell@2
147-
displayName: Check Symbol Availability
148-
inputs:
149-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
150-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
151-
152131
- template: ../promote-build.yml
153132
parameters:
154133
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}

eng/common/templates/post-build/channels/netcore-dev-5.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
enableSymbolValidation: true
32
symbolPublishingAdditionalParameters: ''
43
artifactsPublishingAdditionalParameters: ''
54
publishInstallersAndChecksums: false
@@ -135,26 +134,6 @@ stages:
135134
jobs:
136135
- template: ../setup-maestro-vars.yml
137136

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

eng/common/templates/post-build/channels/netcore-internal-30.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
enableSymbolValidation: true
32
symbolPublishingAdditionalParameters: ''
43
artifactsPublishingAdditionalParameters: ''
54

@@ -125,26 +124,6 @@ stages:
125124
jobs:
126125
- template: ../setup-maestro-vars.yml
127126

128-
- ${{ if eq(parameters.enableSymbolValidation, 'true') }}:
129-
- job:
130-
displayName: Symbol Availability
131-
dependsOn: setupMaestroVars
132-
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id))
133-
pool:
134-
vmImage: 'windows-2019'
135-
steps:
136-
- task: DownloadBuildArtifacts@0
137-
displayName: Download Package Artifacts
138-
inputs:
139-
buildType: current
140-
artifactName: PackageArtifacts
141-
142-
- task: PowerShell@2
143-
displayName: Check Symbol Availability
144-
inputs:
145-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
146-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
147-
148127
- template: ../promote-build.yml
149128
parameters:
150129
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}

eng/common/templates/post-build/channels/netcore-release-30.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
enableSymbolValidation: true
32
symbolPublishingAdditionalParameters: ''
43
artifactsPublishingAdditionalParameters: ''
54

@@ -125,27 +124,6 @@ stages:
125124
jobs:
126125
- template: ../setup-maestro-vars.yml
127126

128-
- ${{ if eq(parameters.enableSymbolValidation, 'true') }}:
129-
- job:
130-
displayName: Symbol Availability
131-
dependsOn: setupMaestroVars
132-
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)),
133-
contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)))
134-
pool:
135-
vmImage: 'windows-2019'
136-
steps:
137-
- task: DownloadBuildArtifacts@0
138-
displayName: Download Package Artifacts
139-
inputs:
140-
buildType: current
141-
artifactName: PackageArtifacts
142-
143-
- task: PowerShell@2
144-
displayName: Check Symbol Availability
145-
inputs:
146-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
147-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
148-
149127
- template: ../promote-build.yml
150128
parameters:
151129
ChannelId: ${{ variables.PublicRelease_30_Channel_Id }}

0 commit comments

Comments
 (0)