Skip to content

Commit acad85f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210212.3 (#30155)
[release/5.0] Update dependencies from dotnet/arcade
1 parent 3aad49b commit acad85f

File tree

7 files changed

+43
-21
lines changed

7 files changed

+43
-21
lines changed

‎NuGet.config

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<!-- Begin: Package sources from dotnet-efcore -->
77
<!-- End: Package sources from dotnet-efcore -->
88
<!-- Begin: Package sources from dotnet-runtime -->
9-
<add key="darc-int-dotnet-runtime-8a5d98f" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-8a5d98fb/nuget/v3/index.json" />
109
<!-- End: Package sources from dotnet-runtime -->
1110
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1211
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,12 +19,8 @@
2019
<disabledPackageSources>
2120
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2221
<!-- Begin: Package sources from dotnet-runtime -->
23-
<add key="darc-int-dotnet-runtime-8a5d98f" value="true" />
24-
<add key="darc-int-dotnet-runtime-d1e2874" value="true" />
25-
<add key="darc-int-dotnet-runtime-c636bbd" value="true" />
2622
<!-- End: Package sources from dotnet-runtime -->
2723
<!-- Begin: Package sources from dotnet-efcore -->
28-
<add key="darc-int-dotnet-efcore-efc2924" value="true" />
2924
<!-- End: Package sources from dotnet-efcore -->
3025
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3126
</disabledPackageSources>

‎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://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
314314
<Sha>d1e2874de3956c618626ee46554a093f28a330e2</Sha>
315315
</Dependency>
316-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21109.6">
316+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21112.3">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
318+
<Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21109.6">
320+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21112.3">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
322+
<Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21109.6">
324+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21112.3">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
326+
<Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
327327
</Dependency>
328328
</ToolsetDependencies>
329329
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<MicrosoftEntityFrameworkCorePackageVersion>5.0.3</MicrosoftEntityFrameworkCorePackageVersion>
136136
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreDesignPackageVersion>
137137
<!-- Packages from dotnet/arcade -->
138-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21109.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
138+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21112.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
139139
</PropertyGroup>
140140
<!--
141141

‎eng/common/internal-feed-operations.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ function SetupCredProvider {
6363
}
6464

6565
if (($endpoints | Measure-Object).Count -gt 0) {
66-
# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")]
67-
# Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
6866
$endpointCredentials = @{endpointCredentials=$endpoints} | ConvertTo-Json -Compress
6967

7068
# Create the environment variables the AzDo way

‎eng/common/internal-feed-operations.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ function SetupCredProvider {
6262
endpoints+=']'
6363

6464
if [ ${#endpoints} -gt 2 ]; then
65-
# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Endpoint code example with no real credentials.")]
66-
# Create the JSON object. It should look like '{"endpointCredentials": [{"endpoint":"http://example.index.json", "username":"optional", "password":"accesstoken"}]}'
6765
local endpointCredentials="{\"endpointCredentials\": "$endpoints"}"
6866

6967
echo "##vso[task.setvariable variable=VSS_NUGET_EXTERNAL_FEED_ENDPOINTS]$endpointCredentials"

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

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ parameters:
6565
VS167ChannelId: 1011
6666
VS168ChannelId: 1154
6767
VSMasterChannelId: 1012
68-
68+
VS169ChannelId: 1473
69+
VS1610ChannelId: 1692
70+
6971
stages:
7072
- ${{ if or(and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')), eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}:
7173
- stage: Validate
@@ -94,8 +96,7 @@ stages:
9496
inputs:
9597
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
9698
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}}
98-
99+
-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}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}}
99100
- job:
100101
displayName: NuGet Validation
101102
dependsOn: setupMaestroVars
@@ -608,3 +609,33 @@ stages:
608609
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
609610
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
610611
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
612+
613+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
614+
parameters:
615+
BARBuildId: ${{ parameters.BARBuildId }}
616+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
617+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
618+
dependsOn: ${{ parameters.publishDependsOn }}
619+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
620+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
621+
stageName: 'VS_16_9_Publishing'
622+
channelName: 'VS 16.9'
623+
channelId: ${{ parameters.VS169ChannelId }}
624+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
625+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
626+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
627+
628+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
629+
parameters:
630+
BARBuildId: ${{ parameters.BARBuildId }}
631+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
632+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
633+
dependsOn: ${{ parameters.publishDependsOn }}
634+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
635+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
636+
stageName: 'VS_16_10_Publishing'
637+
channelName: 'VS 16.10'
638+
channelId: ${{ parameters.VS1610ChannelId }}
639+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
640+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
641+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'

‎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": "5.0.0-beta.21109.6",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21109.6"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21112.3"
3535
}
3636
}

0 commit comments

Comments
 (0)