Skip to content

Commit f46cc9e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20190905.21 (#1794)
- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19455.21 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19455.21 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19455.21 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19455.21 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19455.21
1 parent 3bf961a commit f46cc9e

15 files changed

+258
-308
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
6464
<Sha>b9dd6c969c15a2734aecbd3e2aa83afed02040e4</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19455.3">
66+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19455.21">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
68+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19455.3">
70+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19455.21">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
72+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
7373
</Dependency>
7474
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc1.19453.4" CoherentParentDependency="Microsoft.NETCore.App">
7575
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -95,17 +95,17 @@
9595
<Uri>https://github.com/dotnet/coreclr</Uri>
9696
<Sha>d67367f691e789cf670f48dc646c66e63b804f8d</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19455.3">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19455.21">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
100+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19455.3">
102+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19455.21">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
104+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19455.3">
106+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19455.21">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>fee4ebe849050a385a4999e4c84fa61c1dc234bb</Sha>
108+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
</PropertyGroup>
4242
<!-- Packages that come from https://github.com/dotnet/arcade -->
4343
<PropertyGroup>
44-
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19455.3</MicrosoftDotNetApiCompatVersion>
45-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19455.3</MicrosoftDotNetCodeAnalysisPackageVersion>
46-
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19455.3</MicrosoftDotNetGenAPIVersion>
44+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19455.21</MicrosoftDotNetApiCompatVersion>
45+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19455.21</MicrosoftDotNetCodeAnalysisPackageVersion>
46+
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19455.21</MicrosoftDotNetGenAPIVersion>
4747
</PropertyGroup>
4848
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
4949
<PropertyGroup>

‎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/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 & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ stages:
4747
/p:Configuration=Release
4848
${{ parameters.symbolPublishingAdditionalParameters }}
4949

50-
- job:
50+
- job: publish_assets
5151
displayName: Publish Assets
5252
dependsOn: setupMaestroVars
5353
variables:
@@ -79,55 +79,48 @@ stages:
7979
buildType: current
8080
artifactName: AssetManifests
8181

82+
- task: NuGetToolInstaller@1
83+
displayName: 'Install NuGet.exe'
84+
85+
# This is necessary whenever we want to publish/restore to an AzDO private feed
86+
- task: NuGetAuthenticate@0
87+
displayName: 'Authenticate to AzDO Feeds'
88+
8289
- task: PowerShell@2
83-
displayName: Add Assets Location
90+
displayName: Publish Assets
8491
env:
85-
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
92+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
8693
inputs:
8794
filePath: eng\common\sdk-task.ps1
88-
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
89-
/p:ChannelId=$(PublicDevRelease_30_Channel_Id)
95+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
9096
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
9197
/p:IsStableBuild=$(IsStableBuild)
9298
/p:IsInternalBuild=$(IsInternalBuild)
9399
/p:RepositoryName=$(Build.Repository.Name)
94100
/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
101+
/p:StaticInternalFeed=$(StaticInternalFeed)
102+
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
103+
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
104+
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
105+
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
106+
/p:NugetPath=$(NuGetExeToolPath)
107+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
108+
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
109+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
110+
/p:BARBuildId=$(BARBuildId)
111+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
112+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
113+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
114+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
115+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
116+
/p:Configuration=Release
106117
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
107118
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
108119
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
109120
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
110121
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
111122
${{ parameters.artifactsPublishingAdditionalParameters }}
112123

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-
131124

132125
- stage: NetCore_Dev30_Publish_Validation
133126
displayName: .NET Core 3.0 Dev Publish Validation
@@ -156,10 +149,6 @@ stages:
156149
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
157150
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
158151

159-
- template: ../darc-gather-drop.yml
160-
parameters:
161-
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}
162-
163152
- template: ../promote-build.yml
164153
parameters:
165154
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

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

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,33 @@ stages:
7979
buildType: current
8080
artifactName: AssetManifests
8181

82+
- task: NuGetToolInstaller@1
83+
displayName: 'Install NuGet.exe'
84+
85+
# This is necessary whenever we want to publish/restore to an AzDO private feed
86+
- task: NuGetAuthenticate@0
87+
displayName: 'Authenticate to AzDO Feeds'
88+
8289
- task: PowerShell@2
83-
displayName: Add Assets Location
90+
displayName: Publish Assets
8491
env:
85-
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw)
92+
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
8693
inputs:
8794
filePath: eng\common\sdk-task.ps1
8895
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
89-
/p:ChannelId=$(PublicDevRelease_31_Channel_Id)
9096
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
9197
/p:IsStableBuild=$(IsStableBuild)
9298
/p:IsInternalBuild=$(IsInternalBuild)
9399
/p:RepositoryName=$(Build.Repository.Name)
94100
/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)'
101+
/p:StaticInternalFeed=$(StaticInternalFeed)
102+
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
103+
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
104+
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
105+
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
106+
/p:NugetPath=$(NuGetExeToolPath)
107+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
108+
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
98109
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
99110
/p:BARBuildId=$(BARBuildId)
100111
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
@@ -110,24 +121,6 @@ stages:
110121
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
111122
${{ parameters.artifactsPublishingAdditionalParameters }}
112123

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-
131124

132125
- stage: NetCore_Dev31_Publish_Validation
133126
displayName: .NET Core 3.1 Dev Publish Validation
@@ -156,10 +149,6 @@ stages:
156149
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
157150
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)
158151

159-
- template: ../darc-gather-drop.yml
160-
parameters:
161-
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}
162-
163152
- template: ../promote-build.yml
164153
parameters:
165154
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}

0 commit comments

Comments
 (0)