Skip to content

Commit 73c2599

Browse files
dotnet-maestro[bot]dougbu
dotnet-maestro[bot]
authored and
dougbu
committed
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
1 parent d2d5262 commit 73c2599

19 files changed

+262
-458
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19454.31">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19456.10">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
81+
<Sha>2d393243ba4a0c95c2c18aa266df6e0f43ffe22d</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19454.31">
83+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19456.10">
8484
<Uri>https://github.com/dotnet/arcade</Uri>
85-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
85+
<Sha>2d393243ba4a0c95c2c18aa266df6e0f43ffe22d</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19454.31">
87+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19456.10">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
89+
<Sha>2d393243ba4a0c95c2c18aa266df6e0f43ffe22d</Sha>
9090
</Dependency>
9191
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc1.19456.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
9292
<Uri>https://github.com/dotnet/corefx</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
6262
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-rc1.19456.4</MicrosoftNETCorePlatformsPackageVersion>
6363
<!-- Packages from dotnet/arcade -->
64-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19454.31</MicrosoftDotNetGenAPIPackageVersion>
64+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19456.10</MicrosoftDotNetGenAPIPackageVersion>
6565
<!-- Packages from dotnet/roslyn -->
6666
<MicrosoftNetCompilersToolsetVersion>3.3.1-beta3-19454-05</MicrosoftNetCompilersToolsetVersion>
6767
</PropertyGroup>

‎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/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

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

Lines changed: 27 additions & 59 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
@@ -47,7 +46,7 @@ stages:
4746
/p:Configuration=Release
4847
${{ parameters.symbolPublishingAdditionalParameters }}
4948

50-
- job:
49+
- job: publish_assets
5150
displayName: Publish Assets
5251
dependsOn: setupMaestroVars
5352
variables:
@@ -79,55 +78,48 @@ 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
88-
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
89-
/p:ChannelId=$(PublicDevRelease_30_Channel_Id)
94+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
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)'
98-
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
99-
/p:BARBuildId=$(BARBuildId)
100-
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
101-
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
102-
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
103-
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
104-
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
105-
/p:Configuration=Release
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)'
108+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
109+
/p:BARBuildId=$(BARBuildId)
110+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
111+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
112+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
113+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
114+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
115+
/p:Configuration=Release
106116
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
107117
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
108118
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
109119
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
110120
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
111121
${{ parameters.artifactsPublishingAdditionalParameters }}
112122

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
130-
131123

132124
- stage: NetCore_Dev30_Publish_Validation
133125
displayName: .NET Core 3.0 Dev Publish Validation
@@ -136,30 +128,6 @@ stages:
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
160-
parameters:
161-
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}
162-
163131
- template: ../promote-build.yml
164132
parameters:
165133
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

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

Lines changed: 17 additions & 49 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
@@ -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_31_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)'
@@ -110,24 +120,6 @@ stages:
110120
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
111121
${{ parameters.artifactsPublishingAdditionalParameters }}
112122

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
130-
131123

132124
- stage: NetCore_Dev31_Publish_Validation
133125
displayName: .NET Core 3.1 Dev Publish Validation
@@ -136,30 +128,6 @@ stages:
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_31_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
160-
parameters:
161-
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}
162-
163131
- template: ../promote-build.yml
164132
parameters:
165133
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}

0 commit comments

Comments
 (0)