Skip to content

Commit 8dc4f8a

Browse files
dotnet-maestro[bot]vlada-shubina
dotnet-maestro[bot]
authored and
vlada-shubina
committed
Update dependencies from https://github.com/dotnet/arcade build 20210212.3
Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.21063.3 -> To Version 5.0.0-beta.21112.3
1 parent 6ef3848 commit 8dc4f8a

File tree

8 files changed

+40
-24
lines changed

8 files changed

+40
-24
lines changed

‎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="5.0.0-beta.21063.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21112.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
8+
<Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎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/sdl/init-sdl.ps1‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,7 @@ $zipFile = "$WorkingDirectory/gdn.zip"
2929

3030
Add-Type -AssemblyName System.IO.Compression.FileSystem
3131
$gdnFolder = (Join-Path $WorkingDirectory '.gdn')
32-
try {
33-
# We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead
34-
Write-Host 'Downloading gdn folder from internal config repostiory...'
35-
Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile
36-
if (Test-Path $gdnFolder) {
37-
# Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case)
38-
Remove-Item -Force -Recurse $gdnFolder
39-
}
40-
[System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory)
41-
Write-Host $gdnFolder
42-
ExitWithExitCode 0
43-
} catch [System.Net.WebException] { } # Catch and ignore webexception
32+
4433
try {
4534
# if the folder does not exist, we'll do a guardian init and push it to the remote repository
4635
Write-Host 'Initializing Guardian...'

‎eng/common/sdl/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli.win10-x64" version="0.20.1"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.53.3"/>
44
</packages>

‎eng/common/templates/job/execute-sdl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
continueOnError: ${{ parameters.sdlContinueOnError }}
8484
- ${{ if eq(parameters.overrideParameters, '') }}:
8585
- powershell: eng/common/sdl/execute-all-sdl-tools.ps1
86-
-GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1
86+
-GuardianPackageName Microsoft.Guardian.Cli.0.53.3
8787
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
8888
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
8989
${{ parameters.additionalParameters }}

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3"
11+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3"
1212
}
1313
}

0 commit comments

Comments
 (0)