From cb70c7ca306ebf0bf407e89e4e1596207e532914 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Jul 2020 18:19:32 +0000 Subject: [PATCH 01/12] Update dependencies from https://github.com/dotnet/arcade build 20200707.2 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20357.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d3193769..7ce610942 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 19be59d10459a5a83a76b192af38dbe4f4e2e23b + 110aa177bf70a76c3591e0f2737396f77237d9dd - + https://github.com/dotnet/arcade - 19be59d10459a5a83a76b192af38dbe4f4e2e23b + 110aa177bf70a76c3591e0f2737396f77237d9dd diff --git a/global.json b/global.json index ea5164470..6ce346994 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20357.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20357.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20357.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20357.2" } } From 22ef294bc35e6afe541ea76bb51cb42e176cf31f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jul 2020 00:56:04 +0000 Subject: [PATCH 02/12] Update dependencies from https://github.com/dotnet/arcade build 20200707.4 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20357.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ce610942..2f5989891 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 110aa177bf70a76c3591e0f2737396f77237d9dd + 9bd0f76c8e3e6940f8ed24026c095193132d6378 - + https://github.com/dotnet/arcade - 110aa177bf70a76c3591e0f2737396f77237d9dd + 9bd0f76c8e3e6940f8ed24026c095193132d6378 diff --git a/global.json b/global.json index 6ce346994..201636fdb 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20357.2", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20357.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20357.4", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20357.4" } } From 5b4f8576c21154d1b0cde271cb83fc90baf54682 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jul 2020 20:05:50 +0000 Subject: [PATCH 03/12] Update dependencies from https://github.com/dotnet/arcade build 20200708.1 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20358.1 --- eng/Version.Details.xml | 8 +-- .../templates/post-build/post-build.yml | 60 ++++++++++++------- global.json | 4 +- 3 files changed, 43 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f5989891..c7dffb1ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 9bd0f76c8e3e6940f8ed24026c095193132d6378 + de9bf1d5f3963795dd469610d9decaa30343f46e - + https://github.com/dotnet/arcade - 9bd0f76c8e3e6940f8ed24026c095193132d6378 + de9bf1d5f3963795dd469610d9decaa30343f46e diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 07fc2e982..0e79a546b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -46,15 +46,16 @@ parameters: NETCoreExperimentalChannelId: 562 NetEngServicesIntChannelId: 678 NetEngServicesProdChannelId: 679 - Net5Preview5ChannelId: 857 - Net5Preview6ChannelId: 1013 Net5Preview7ChannelId: 1065 + Net5Preview8ChannelId: 1155 + Net5RC1ChannelId: 1157 NetCoreSDK313xxChannelId: 759 NetCoreSDK313xxInternalChannelId: 760 NetCoreSDK314xxChannelId: 921 NetCoreSDK314xxInternalChannelId: 922 VS166ChannelId: 1010 VS167ChannelId: 1011 + VS168ChannelId: 1154 VSMasterChannelId: 1012 stages: @@ -114,7 +115,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.Net5Preview6ChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VSMasterChannelId}} + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - job: displayName: NuGet Validation @@ -275,41 +276,41 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview5_Publish' - channelName: '.NET 5 Preview 5' - akaMSChannelName: 'net5/preview5' - channelId: ${{ parameters.Net5Preview5ChannelId }} + stageName: 'Net5_Preview7_Publish' + channelName: '.NET 5 Preview 7' + akaMSChannelName: 'net5/preview7' + channelId: ${{ parameters.Net5Preview7ChannelId }} transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview6_Publish' - channelName: '.NET 5 Preview 6' - akaMSChannelName: 'net5/preview6' - channelId: ${{ parameters.Net5Preview6ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + stageName: 'Net5_Preview8_Publish' + channelName: '.NET 5 Preview 8' + akaMSChannelName: 'net5/preview8' + channelId: ${{ parameters.Net5Preview8ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview7_Publish' - channelName: '.NET 5 Preview 7' - akaMSChannelName: 'net5/preview7' - channelId: ${{ parameters.Net5Preview7ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + stageName: 'Net5_RC1_Publish' + channelName: '.NET 5 RC 1' + akaMSChannelName: 'net5/rc1' + channelId: ${{ parameters.Net5RC1ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json' - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: @@ -509,6 +510,19 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_8_Publishing' + channelName: 'VS 16.8' + channelId: ${{ parameters.VS168ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/global.json b/global.json index 201636fdb..48d3725dc 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20357.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20357.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20358.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20358.1" } } From a04efa2245cbf3083d1d091136453da1dcdce666 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Jul 2020 22:46:46 +0000 Subject: [PATCH 04/12] Update dependencies from https://github.com/dotnet/arcade build 20200708.2 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20358.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7dffb1ce..be246787e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - de9bf1d5f3963795dd469610d9decaa30343f46e + 004fa78d42d7cad217a0097e3ebaabba06e5f02c - + https://github.com/dotnet/arcade - de9bf1d5f3963795dd469610d9decaa30343f46e + 004fa78d42d7cad217a0097e3ebaabba06e5f02c diff --git a/global.json b/global.json index 48d3725dc..4244df655 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20358.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20358.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20358.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20358.2" } } From 5f441d715e72db012422a9f77eaa02923d00105c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Jul 2020 18:03:29 +0000 Subject: [PATCH 05/12] Update dependencies from https://github.com/dotnet/arcade build 20200709.4 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20359.4 --- eng/Version.Details.xml | 8 ++++---- .../post-build/channels/generic-internal-channel.yml | 4 ++++ global.json | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be246787e..8d7e88d27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 004fa78d42d7cad217a0097e3ebaabba06e5f02c + 2122622b77e1b946e209df874f5b2bad2a0b3406 - + https://github.com/dotnet/arcade - 004fa78d42d7cad217a0097e3ebaabba06e5f02c + 2122622b77e1b946e209df874f5b2bad2a0b3406 diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 258ba4b77..12db36ebe 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -35,6 +35,10 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Build Assets continueOnError: true diff --git a/global.json b/global.json index 4244df655..f1efa5132 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20358.2", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20358.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20359.4", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20359.4" } } From bde5c676a35df9c6f21c38278987cb379775df26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Jul 2020 21:03:41 +0000 Subject: [PATCH 06/12] Update dependencies from https://github.com/dotnet/arcade build 20200709.8 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20359.8 --- eng/Version.Details.xml | 8 ++-- eng/common/SetupNugetSources.ps1 | 12 +++--- eng/common/SetupNugetSources.sh | 41 ++++++++++---------- eng/common/post-build/symbols-validation.ps1 | 2 +- eng/common/templates/job/job.yml | 12 ++++++ global.json | 4 +- 6 files changed, 45 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d7e88d27..2833e9c0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 2122622b77e1b946e209df874f5b2bad2a0b3406 + d27565e8c4f8015ec6b50d037e6d2c00c11ccb23 - + https://github.com/dotnet/arcade - 2122622b77e1b946e209df874f5b2bad2a0b3406 + d27565e8c4f8015ec6b50d037e6d2c00c11ccb23 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index c3c473eb8..a2ad30f0a 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -128,16 +128,16 @@ $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password -$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") -if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password -} - $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } +$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']") +if ($dotnet5Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 7d6fef27f..1e9e34b8c 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -79,53 +79,52 @@ fi PackageSources=() -# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present -grep -i "" $ConfigFile + grep -i "" + PackageSourceTemplate="${TB}" sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile fi - PackageSources+=('dotnet3-internal') + PackageSources+=('dotnet3.1-internal') - grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal-transport to the packageSources." + echo "Adding dotnet3.1-internal-transport to the packageSources." PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + PackageSourceTemplate="${TB}" sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile fi - PackageSources+=('dotnet3-internal-transport') + PackageSources+=('dotnet3.1-internal-transport') fi -# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present -grep -i "" + PackageSourceTemplate="${TB}" sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile fi - PackageSources+=('dotnet3.1-internal') + PackageSources+=('dotnet5-internal') - grep -i "" $ConfigFile + grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal-transport to the packageSources." + echo "Adding dotnet5-internal-transport to the packageSources." PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + PackageSourceTemplate="${TB}" sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile fi - PackageSources+=('dotnet3.1-internal-transport') + PackageSources+=('dotnet5-internal-transport') fi # I want things split line by line diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 495428ea2..a36fa6f26 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -144,7 +144,7 @@ $CountMissingSymbols = { if ($MissingSymbols -ne 0) { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $FileName" + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath" } Pop-Location diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index c08bb416d..e78ed9a1c 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -65,6 +65,9 @@ jobs: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -124,6 +127,15 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: 'csharp' + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'prod') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + continueOnError: true + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 diff --git a/global.json b/global.json index f1efa5132..c9c01c145 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20359.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20359.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20359.8", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20359.8" } } From 7cf3ec1094cf44c8c7c74fe89d8038c754353502 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jul 2020 13:51:06 +0000 Subject: [PATCH 07/12] Update dependencies from https://github.com/dotnet/arcade build 20200710.2 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20360.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2833e9c0e..8f9cfb9d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - d27565e8c4f8015ec6b50d037e6d2c00c11ccb23 + 365117bcce4666f032f16ca909578ce3d9814aa4 - + https://github.com/dotnet/arcade - d27565e8c4f8015ec6b50d037e6d2c00c11ccb23 + 365117bcce4666f032f16ca909578ce3d9814aa4 diff --git a/global.json b/global.json index c9c01c145..f5560e4d0 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20359.8", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20359.8" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20360.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20360.2" } } From 0247ebd6fa16a50a2260cdb9d977293440587179 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jul 2020 15:37:13 +0000 Subject: [PATCH 08/12] Update dependencies from https://github.com/dotnet/arcade build 20200710.3 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20360.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f9cfb9d0..bccf50595 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 365117bcce4666f032f16ca909578ce3d9814aa4 + 18edeee096ae54b081a0cc337b30cb2b05705b4d - + https://github.com/dotnet/arcade - 365117bcce4666f032f16ca909578ce3d9814aa4 + 18edeee096ae54b081a0cc337b30cb2b05705b4d diff --git a/global.json b/global.json index f5560e4d0..ade65feba 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20360.2", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20360.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20360.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20360.3" } } From 8a99f4f07be3766749742d0812899d6f94ea300a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jul 2020 19:51:34 +0000 Subject: [PATCH 09/12] Update dependencies from https://github.com/dotnet/arcade build 20200710.9 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20360.9 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bccf50595..5621b1e99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 18edeee096ae54b081a0cc337b30cb2b05705b4d + 76b3345575fedca220186076e6ce9e11a36ec70f - + https://github.com/dotnet/arcade - 18edeee096ae54b081a0cc337b30cb2b05705b4d + 76b3345575fedca220186076e6ce9e11a36ec70f diff --git a/global.json b/global.json index ade65feba..a87e36b08 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20360.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20360.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20360.9", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20360.9" } } From 2d7090fa19b8999b9426891eadfe0f94a10bb2a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Jul 2020 00:10:14 +0000 Subject: [PATCH 10/12] Update dependencies from https://github.com/dotnet/arcade build 20200710.13 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20360.13 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5621b1e99..b2f552291 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 76b3345575fedca220186076e6ce9e11a36ec70f + 1b6aee736886a15adea6f492db709115e5cdcfd8 - + https://github.com/dotnet/arcade - 76b3345575fedca220186076e6ce9e11a36ec70f + 1b6aee736886a15adea6f492db709115e5cdcfd8 diff --git a/global.json b/global.json index a87e36b08..120f39fac 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20360.9", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20360.9" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20360.13", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20360.13" } } From 5dc899b6c319e7a91d8fd66a54fe53639616f7e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jul 2020 18:19:48 +0000 Subject: [PATCH 11/12] Update dependencies from https://github.com/dotnet/arcade build 20200713.1 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20363.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2f552291..27dfebc8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 1b6aee736886a15adea6f492db709115e5cdcfd8 + 6e3081324226764c6bd83e858d2834243cda919d - + https://github.com/dotnet/arcade - 1b6aee736886a15adea6f492db709115e5cdcfd8 + 6e3081324226764c6bd83e858d2834243cda919d diff --git a/global.json b/global.json index 120f39fac..725d972bd 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20360.13", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20360.13" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20363.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20363.1" } } From 88ed522164d4276c1c85e3fafb122ee2a207f59e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jul 2020 00:34:04 +0000 Subject: [PATCH 12/12] Update dependencies from https://github.com/dotnet/arcade build 20200713.3 Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20357.1 -> To Version 5.0.0-beta.20363.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27dfebc8c..ae166405b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 6e3081324226764c6bd83e858d2834243cda919d + 9e16d2cc8065181c3cad731c24584c6964663525 - + https://github.com/dotnet/arcade - 6e3081324226764c6bd83e858d2834243cda919d + 9e16d2cc8065181c3cad731c24584c6964663525 diff --git a/global.json b/global.json index 725d972bd..35f86d945 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20363.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20363.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20363.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20363.3" } }