Skip to content

Commit 3a20e87

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20201111.5 (#27880)
[master] Update dependencies from dotnet/arcade
1 parent 2ec4ea1 commit 3a20e87

File tree

9 files changed

+30
-89
lines changed

9 files changed

+30
-89
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@
313313
<Uri>https://github.com/dotnet/runtime</Uri>
314314
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
315315
</Dependency>
316-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20552.5">
316+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20561.5">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
318+
<Sha>e65d307045c183af6e48b087571f6b7a05e39f01</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20552.5">
320+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20561.5">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
322+
<Sha>e65d307045c183af6e48b087571f6b7a05e39f01</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20552.5">
324+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20561.5">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
326+
<Sha>e65d307045c183af6e48b087571f6b7a05e39f01</Sha>
327327
</Dependency>
328328
</ToolsetDependencies>
329329
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<MicrosoftEntityFrameworkCoreVersion>6.0.0-alpha.1.20563.8</MicrosoftEntityFrameworkCoreVersion>
143143
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-alpha.1.20563.8</MicrosoftEntityFrameworkCoreDesignVersion>
144144
<!-- Packages from dotnet/arcade -->
145-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20552.5</MicrosoftDotNetBuildTasksInstallersVersion>
145+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20561.5</MicrosoftDotNetBuildTasksInstallersVersion>
146146
</PropertyGroup>
147147
<!--
148148

‎eng/common/performance/crossgen_perf.proj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@
6868
<ItemGroup>
6969
<CrossgenSizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
7070
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
71-
<PreCommands>$(Python) pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
72-
<Command>$(Python) test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen/</Command>
73-
<PostCommands>$(Python) post.py</PostCommands>
71+
<PreCommands>$(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
72+
<Command>$(Python) $(CrossgenDirectory)test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen/</Command>
73+
<PostCommands>$(Python) $(CrossgenDirectory)post.py</PostCommands>
7474
</CrossgenSizeOnDiskWorkItem>
7575
</ItemGroup>
7676

7777
<ItemGroup>
7878
<Crossgen2SizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
7979
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
8080
<PreCommands>$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) </PreCommands>
81-
<Command>$(Python) test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen/</Command>
82-
<PostCommands>$(Python) post.py</PostCommands>
81+
<Command>$(Python) $(Crossgen2Directory)test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen/</Command>
82+
<PostCommands>$(Python) $(Crossgen2Directory)post.py</PostCommands>
8383
</Crossgen2SizeOnDiskWorkItem>
8484
</ItemGroup>
8585

‎eng/common/performance/performance-setup.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ $SetupArguments = "--repository https://github.com/$Repository --branch $Branch
8282
#This grabs the LKG version number of dotnet and passes it to our scripts
8383
$VersionJSON = Get-Content global.json | ConvertFrom-Json
8484
$DotNetVersion = $VersionJSON.tools.dotnet
85-
$SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
85+
# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
86+
# $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
87+
$SetupArguments = "--dotnet-versions 6.0.100-alpha.1.20553.6 $SetupArguments"
8688

8789

8890
if ($RunFromPerformanceRepo) {

‎eng/common/performance/performance-setup.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ if [[ "$use_latest_dotnet" = false ]]; then
223223
# Get the tools section from the global.json.
224224
# This grabs the LKG version number of dotnet and passes it to our scripts
225225
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
226-
setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
226+
# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
227+
# setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
228+
setup_arguments="--dotnet-versions 6.0.100-alpha.1.20553.6 $setup_arguments"
227229
fi
228230

229231
if [[ "$run_from_perf_repo" = true ]]; then

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ param(
1010
[Parameter(Mandatory=$false)][string] $EnableNugetValidation,
1111
[Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
1212
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
13+
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
1314
[Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
1415
)
1516

@@ -25,6 +26,11 @@ try {
2526
$optionalParams.Add($ArtifactsPublishingAdditionalParameters) | Out-Null
2627
}
2728

29+
if ("" -ne $SymbolPublishingAdditionalParameters) {
30+
$optionalParams.Add("symbol-publishing-parameters") | Out-Null
31+
$optionalParams.Add($SymbolPublishingAdditionalParameters) | Out-Null
32+
}
33+
2834
if ("false" -eq $WaitPublishingFinish) {
2935
$optionalParams.Add("--no-wait") | Out-Null
3036
}

‎eng/common/templates/job/job.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ parameters:
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
27-
useBuildManifest: false
2827
mergeTestResults: false
2928
testRunTitle: ''
3029
testResultsFormat: ''
@@ -243,12 +242,3 @@ jobs:
243242
ArtifactName: AssetManifests
244243
continueOnError: ${{ parameters.continueOnError }}
245244
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
246-
247-
- ${{ if eq(parameters.useBuildManifest, true) }}:
248-
- task: PublishBuildArtifacts@1
249-
displayName: Publish Build Manifest
250-
inputs:
251-
PathToPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/manifest.props'
252-
PublishLocation: Container
253-
ArtifactName: BuildManifests
254-
continueOnError: ${{ parameters.continueOnError }}

‎eng/common/templates/post-build/post-build.yml

Lines changed: 4 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ parameters:
3232
symbolPublishingAdditionalParameters: ''
3333
artifactsPublishingAdditionalParameters: ''
3434
signingValidationAdditionalParameters: ''
35-
useBuildManifest: false
3635

3736
# Which stages should finish execution before post-build stages start
3837
validateDependsOn:
@@ -54,9 +53,6 @@ parameters:
5453
NETCoreExperimentalChannelId: 562
5554
NetEngServicesIntChannelId: 678
5655
NetEngServicesProdChannelId: 679
57-
Net5Preview8ChannelId: 1155
58-
Net5RC1ChannelId: 1157
59-
Net5RC2ChannelId: 1329
6056
NetCoreSDK313xxChannelId: 759
6157
NetCoreSDK313xxInternalChannelId: 760
6258
NetCoreSDK314xxChannelId: 921
@@ -94,7 +90,7 @@ stages:
9490
inputs:
9591
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
9692
arguments: -PromoteToChannels "$(TargetChannels)"
97-
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
93+
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
9894

9995
- job:
10096
displayName: NuGet Validation
@@ -142,16 +138,6 @@ stages:
142138
pool:
143139
vmImage: 'windows-2019'
144140
steps:
145-
- ${{ if eq(parameters.useBuildManifest, true) }}:
146-
- task: DownloadBuildArtifacts@0
147-
displayName: Download build manifest
148-
inputs:
149-
buildType: specific
150-
buildVersionToDownload: specific
151-
project: $(AzDOProjectName)
152-
pipeline: $(AzDOPipelineId)
153-
buildId: $(AzDOBuildId)
154-
artifactName: BuildManifests
155141
- task: DownloadBuildArtifacts@0
156142
displayName: Download Package Artifacts
157143
inputs:
@@ -253,6 +239,7 @@ stages:
253239
- job:
254240
displayName: Publish Using Darc
255241
dependsOn: setupMaestroVars
242+
timeoutInMinutes: 120
256243
variables:
257244
- name: BARBuildId
258245
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
@@ -269,6 +256,8 @@ stages:
269256
-MaestroToken '$(MaestroApiAccessToken)'
270257
-WaitPublishingFinish ${{ parameters.waitPublishingFinish }}
271258
-PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }}
259+
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
260+
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
272261

273262
- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}:
274263
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
@@ -303,54 +292,6 @@ stages:
303292
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
304293
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
305294

306-
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
307-
parameters:
308-
BARBuildId: ${{ parameters.BARBuildId }}
309-
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
310-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
311-
dependsOn: ${{ parameters.publishDependsOn }}
312-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
313-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
314-
stageName: 'Net5_Preview8_Publish'
315-
channelName: '.NET 5 Preview 8'
316-
akaMSChannelName: 'net5/preview8'
317-
channelId: ${{ parameters.Net5Preview8ChannelId }}
318-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json'
319-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
320-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
321-
322-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
323-
parameters:
324-
BARBuildId: ${{ parameters.BARBuildId }}
325-
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
326-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
327-
dependsOn: ${{ parameters.publishDependsOn }}
328-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
329-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
330-
stageName: 'Net5_RC1_Publish'
331-
channelName: '.NET 5 RC 1'
332-
akaMSChannelName: 'net5/rc1'
333-
channelId: ${{ parameters.Net5RC1ChannelId }}
334-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
335-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
336-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
337-
338-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
339-
parameters:
340-
BARBuildId: ${{ parameters.BARBuildId }}
341-
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
342-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
343-
dependsOn: ${{ parameters.publishDependsOn }}
344-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
345-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
346-
stageName: 'Net5_RC2_Publish'
347-
channelName: '.NET 5 RC 2'
348-
akaMSChannelName: 'net5/rc2'
349-
channelId: ${{ parameters.Net5RC2ChannelId }}
350-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
351-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
352-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
353-
354295
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
355296
parameters:
356297
BARBuildId: ${{ parameters.BARBuildId }}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20552.5",
34-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20552.5"
33+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20561.5",
34+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20561.5"
3535
}
3636
}

0 commit comments

Comments
 (0)