From f8b3a243ce0cd706d349a869765dd08f0a014418 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 13:13:46 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/arcade build 20220113.1 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22056.6 -> To Version 2.5.1-beta.22063.1 --- eng/Version.Details.xml | 76 +-- eng/Versions.props | 30 +- .../channels/generic-internal-channel.yml | 190 ------ .../channels/generic-public-channel.yml | 192 ------- .../templates/post-build/post-build.yml | 539 ++++-------------- global.json | 8 +- 6 files changed, 166 insertions(+), 869 deletions(-) delete mode 100644 eng/common/templates/post-build/channels/generic-internal-channel.yml delete mode 100644 eng/common/templates/post-build/channels/generic-public-channel.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2cfe2c769fe8..a131998a23889 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness d33e67a6c2cc5fe415917c6f9bd17046a929dcc0 - + https://github.com/dotnet/arcade - 34bc5b1611e13bd0ee6a9f38ab8524d2ee489be5 + 7a7ba506eed201288d4182fce8b380b22bdd73cb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 8bc9373cc09ac..2239088e40963 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 2.5.1-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 - 7.0.0-beta.22056.6 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 2.5.1-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 + 7.0.0-beta.22063.1 6.0.0-preview.1.102 diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml deleted file mode 100644 index 8990dfc8c87cc..0000000000000 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ /dev/null @@ -1,190 +0,0 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - artifactsPublishingAdditionalParameters: '' - dependsOn: - - Validate - publishInstallersAndChecksums: true - symbolPublishingAdditionalParameters: '' - stageName: '' - channelName: '' - channelId: '' - transportFeed: '' - shippingFeed: '' - symbolsFeed: '' - -stages: -- stage: ${{ parameters.stageName }} - dependsOn: ${{ parameters.dependsOn }} - variables: - - template: ../common-variables.yml - displayName: ${{ parameters.channelName }} Publishing - jobs: - - template: ../setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - job: publish_symbols - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) - variables: - - group: DotNet-Symbol-Server-Pats - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." - displayName: Warn about v2 Arcade Publishing Usage - - # 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 - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: 'specific' - itemPattern: | - PdbArtifacts/** - BlobArtifacts/** - downloadPath: '$(Build.ArtifactStagingDirectory)' - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - /p:PublishToMSDL=false - ${{ parameters.symbolPublishingAdditionalParameters }} - - - template: ../../steps/publish-logs.yml - parameters: - StageLabel: '${{ parameters.stageName }}' - JobLabel: 'SymbolPublishing' - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - timeoutInMinutes: 120 - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) - pool: - vmImage: 'windows-2019' - steps: - - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." - displayName: Warn about v2 Arcade Publishing Usage - - - task: DownloadBuildArtifacts@0 - displayName: Download Build Assets - continueOnError: true - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: 'specific' - itemPattern: | - PackageArtifacts/** - BlobArtifacts/** - AssetManifests/** - downloadPath: '$(Build.ArtifactStagingDirectory)' - checkDownloadedFiles: true - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:PublishingInfraVersion=2 - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey) - /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) - /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:PublishToMSDL=false - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/publish-logs.yml - parameters: - StageLabel: '${{ parameters.stageName }}' - JobLabel: 'AssetsPublishing' - - - template: ../../steps/add-build-to-channel.yml - parameters: - ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml deleted file mode 100644 index 3220c6a4f92ff..0000000000000 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ /dev/null @@ -1,192 +0,0 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - artifactsPublishingAdditionalParameters: '' - dependsOn: - - Validate - publishInstallersAndChecksums: true - symbolPublishingAdditionalParameters: '' - stageName: '' - channelName: '' - channelId: '' - transportFeed: '' - shippingFeed: '' - symbolsFeed: '' - # If the channel name is empty, no links will be generated - akaMSChannelName: '' - -stages: -- stage: ${{ parameters.stageName }} - dependsOn: ${{ parameters.dependsOn }} - variables: - - template: ../common-variables.yml - displayName: ${{ parameters.channelName }} Publishing - jobs: - - template: ../setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - job: publish_symbols - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) - variables: - - group: DotNet-Symbol-Server-Pats - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." - displayName: Warn about v2 Arcade Publishing Usage - - - task: DownloadBuildArtifacts@0 - displayName: Download Build Assets - continueOnError: true - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: 'specific' - itemPattern: | - PdbArtifacts/** - BlobArtifacts/** - downloadPath: '$(Build.ArtifactStagingDirectory)' - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - template: ../../steps/publish-logs.yml - parameters: - StageLabel: '${{ parameters.stageName }}' - JobLabel: 'SymbolPublishing' - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - timeoutInMinutes: 120 - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - - name: ArtifactsCategory - value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }} - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) - pool: - vmImage: 'windows-2019' - steps: - - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." - displayName: Warn about v2 Arcade Publishing Usage - - - task: DownloadBuildArtifacts@0 - displayName: Download Build Assets - continueOnError: true - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: 'specific' - itemPattern: | - PackageArtifacts/** - BlobArtifacts/** - AssetManifests/** - downloadPath: '$(Build.ArtifactStagingDirectory)' - checkDownloadedFiles: true - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:PublishingInfraVersion=2 - /p:ArtifactsCategory=$(ArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:LatestLinkShortUrlPrefix=dotnet/'${{ parameters.akaMSChannelName }}' - /p:AkaMSClientId=$(akams-client-id) - /p:AkaMSClientSecret=$(akams-client-secret) - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/publish-logs.yml - parameters: - StageLabel: '${{ parameters.stageName }}' - JobLabel: 'AssetsPublishing' - - - template: ../../steps/add-build-to-channel.yml - parameters: - ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 4f79cf0f33703..d1759337abe6a 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,71 +1,89 @@ parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V2 accepts optionally outlining the publishing stages - default is inline. - # Publishing V3 DOES NOT accept inlining the publishing stages. - publishingInfraVersion: 2 - # When set to true the publishing templates from the repo will be used - # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline - inline: true - - # Only used if inline==false. When set to true will stall the current build until - # the Promotion Pipeline build finishes. Otherwise, the current build will continue - # execution concurrently with the promotion build. - waitPublishingFinish: true - - BARBuildId: '' - PromoteToChannelIds: '' - - enableSourceLinkValidation: false - enableSigningValidation: true - enableSymbolValidation: false - enableNugetValidation: true - publishInstallersAndChecksums: true - SDLValidationParameters: - enable: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - signingValidationAdditionalParameters: '' + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' # Which stages should finish execution before post-build stages start - validateDependsOn: - - build - publishDependsOn: - - Validate + - name: validateDependsOn + type: object + default: + - build - # Channel ID's instantiated in this file. - # When adding a new channel implementation the call to `check-channel-consistency.ps1` - # needs to be updated with the new channel ID - NetEngLatestChannelId: 2 - NetEngValidationChannelId: 9 - NetDev5ChannelId: 131 - NetDev6ChannelId: 1296 - GeneralTestingChannelId: 529 - NETCoreToolingDevChannelId: 548 - NETCoreToolingReleaseChannelId: 549 - NETInternalToolingChannelId: 551 - NETCoreExperimentalChannelId: 562 - NetEngServicesIntChannelId: 678 - NetEngServicesProdChannelId: 679 - NetCoreSDK313xxChannelId: 759 - NetCoreSDK313xxInternalChannelId: 760 - NetCoreSDK314xxChannelId: 921 - NetCoreSDK314xxInternalChannelId: 922 - VS166ChannelId: 1010 - VS167ChannelId: 1011 - VS168ChannelId: 1154 - VSMasterChannelId: 1012 - VS169ChannelId: 1473 - VS1610ChannelId: 1692 + - name: publishDependsOn + type: object + default: + - Validate stages: -- ${{ 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')) }}: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - stage: Validate dependsOn: ${{ parameters.validateDependsOn }} displayName: Validate Build Assets @@ -77,23 +95,6 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}: - - job: - displayName: Post-build Checks - dependsOn: setupMaestroVars - variables: - - name: TargetChannels - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ] - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Maestro Channels Consistency - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 - arguments: -PromoteToChannels "$(TargetChannels)" - -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}},${{parameters.VS169ChannelId}},${{parameters.VS1610ChannelId}} - - job: displayName: NuGet Validation dependsOn: setupMaestroVars @@ -229,361 +230,39 @@ stages: artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} -- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - jobs: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - job: - displayName: Publish Using Darc - dependsOn: setupMaestroVars - timeoutInMinutes: 120 - variables: - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' - -WaitPublishingFinish ${{ parameters.waitPublishingFinish }} - -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }} - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - -- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}: - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Dev5_Publish' - channelName: '.NET 5 Dev' - akaMSChannelName: 'net5/dev' - channelId: ${{ parameters.NetDev5ChannelId }} - 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 - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NetCore_Dev6_Publish' - channelName: '.NET 6 Dev' - akaMSChannelName: 'net6/dev' - channelId: ${{ parameters.NetDev6ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml +- stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + jobs: + - template: setup-maestro-vars.yml parameters: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net_Eng_Latest_Publish' - channelName: '.NET Eng - Latest' - akaMSChannelName: 'eng/daily' - channelId: ${{ parameters.NetEngLatestChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net_Eng_Validation_Publish' - channelName: '.NET Eng - Validation' - akaMSChannelName: 'eng/validation' - channelId: ${{ parameters.NetEngValidationChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'General_Testing_Publish' - channelName: 'General Testing' - akaMSChannelName: 'generaltesting' - channelId: ${{ parameters.GeneralTestingChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_Tooling_Dev_Publishing' - channelName: '.NET Core Tooling Dev' - channelId: ${{ parameters.NETCoreToolingDevChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/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: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_Tooling_Release_Publishing' - channelName: '.NET Core Tooling Release' - channelId: ${{ parameters.NETCoreToolingReleaseChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/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-internal-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NET_Internal_Tooling_Publishing' - channelName: '.NET Internal Tooling' - channelId: ${{ parameters.NETInternalToolingChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_Experimental_Publishing' - channelName: '.NET Core Experimental' - channelId: ${{ parameters.NETCoreExperimentalChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net_Eng_Services_Int_Publish' - channelName: '.NET Eng Services - Int' - channelId: ${{ parameters.NetEngServicesIntChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net_Eng_Services_Prod_Publish' - channelName: '.NET Eng Services - Prod' - channelId: ${{ parameters.NetEngServicesProdChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_314xx_Publishing' - channelName: '.NET Core SDK 3.1.4xx' - channelId: ${{ parameters.NetCoreSDK314xxChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_314xx_Internal_Publishing' - channelName: '.NET Core SDK 3.1.4xx Internal' - channelId: ${{ parameters.NetCoreSDK314xxInternalChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_313xx_Publishing' - channelName: '.NET Core SDK 3.1.3xx' - channelId: ${{ parameters.NetCoreSDK313xxChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'NETCore_SDK_313xx_Internal_Publishing' - channelName: '.NET Core SDK 3.1.3xx Internal' - channelId: ${{ parameters.NetCoreSDK313xxInternalChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' - - - template: \eng\common\templates\post-build\channels\generic-public-channel.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS16_6_Publishing' - channelName: 'VS 16.6' - channelId: ${{ parameters.VS166ChannelId }} - 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: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS16_7_Publishing' - channelName: 'VS 16.7' - channelId: ${{ parameters.VS167ChannelId }} - 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: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - 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: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS_Master_Publishing' - channelName: 'VS Master' - channelId: ${{ parameters.VSMasterChannelId }} - 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: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS_16_9_Publishing' - channelName: 'VS 16.9' - channelId: ${{ parameters.VS169ChannelId }} - 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: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'VS_16_10_Publishing' - channelName: 'VS 16.10' - channelId: ${{ parameters.VS1610ChannelId }} - 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' + - job: + displayName: Publish Using Darc + dependsOn: setupMaestroVars + timeoutInMinutes: 120 + variables: + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }} + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file diff --git a/global.json b/global.json index f191cfdd2e352..df0a07e6a5fd9 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22056.6", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22056.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22056.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22056.6", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22063.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22063.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22063.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22059.2" From 20665d713afdeb7c5caff94750ee62cca8267b49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jan 2022 13:14:33 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/arcade build 20220113.6 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22056.6 -> To Version 2.5.1-beta.22063.6 --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 30 ++++---- eng/common/cross/toolchain.cmake | 11 ++- eng/common/post-build/publish-using-darc.ps1 | 28 +------ .../templates/post-build/post-build.yml | 1 - global.json | 8 +- 6 files changed, 67 insertions(+), 87 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a131998a23889..95656d4e8117f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness d33e67a6c2cc5fe415917c6f9bd17046a929dcc0 - + https://github.com/dotnet/arcade - 7a7ba506eed201288d4182fce8b380b22bdd73cb + ecf92bbdc4354adc1960fa53808e87d91624f9b5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2239088e40963..419b6aae70b96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 2.5.1-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 - 7.0.0-beta.22063.1 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 2.5.1-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 + 7.0.0-beta.22063.6 6.0.0-preview.1.102 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index f7878dddd3921..fba2afda438b6 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -37,6 +37,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm") if(TIZEN) set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() +elseif(TARGET_ARCH_NAME STREQUAL "armv6") + set(CMAKE_SYSTEM_PROCESSOR armv6l) + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) + set(TOOLCHAIN "armv6-alpine-linux-musleabihf") + else() + set(TOOLCHAIN "arm-linux-gnueabihf") + endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl) @@ -60,7 +67,7 @@ elseif (ILLUMOS) set(CMAKE_SYSTEM_PROCESSOR "x86_64") set(TOOLCHAIN "x86_64-illumos") else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64, s390x and x86 are supported!") + message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, armv6, arm64, s390x and x86 are supported!") endif() if(DEFINED ENV{TOOLCHAIN}) @@ -194,7 +201,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS) +if((TARGET_ARCH_NAME MATCHES "^(arm|armv6|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 2427ca6b6aec7..8508397d77640 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -5,13 +5,8 @@ param( [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, - [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation, - [Parameter(Mandatory=$false)][string] $EnableSigningValidation, - [Parameter(Mandatory=$false)][string] $EnableNugetValidation, - [Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters + [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters ) try { @@ -35,27 +30,6 @@ try { $optionalParams.Add("--no-wait") | Out-Null } - if ("false" -ne $PublishInstallersAndChecksums) { - $optionalParams.Add("--publish-installers-and-checksums") | Out-Null - } - - if ("true" -eq $EnableNugetValidation) { - $optionalParams.Add("--validate-nuget") | Out-Null - } - - if ("true" -eq $EnableSourceLinkValidation) { - $optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null - } - - if ("true" -eq $EnableSigningValidation) { - $optionalParams.Add("--validate-signingchecksums") | Out-Null - - if ("" -ne $SigningValidationAdditionalParameters) { - $optionalParams.Add("--signing-validation-parameters") | Out-Null - $optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null - } - } - & $darc add-build-to-channel ` --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d1759337abe6a..8985b429c8543 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -263,6 +263,5 @@ stages: -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true - -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }} -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file diff --git a/global.json b/global.json index df0a07e6a5fd9..92d09d0ee6115 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22063.1", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22063.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22063.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22063.6", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22063.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22063.6", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22059.2" From 81b16c7781edc7598b8b46a854316b3fb6464d02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Jan 2022 13:35:57 +0000 Subject: [PATCH 03/14] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220113.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21613.1 -> To Version 7.0.0-preview1.22063.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95656d4e8117f..4dc58b0230da7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,9 +278,9 @@ https://github.com/dotnet/runtime-assets a597df23119faf540d95cebab14b82f084c47384 - + https://github.com/dotnet/roslyn-analyzers - e101c379c6e3c7011562ee3af3e3de066da0048f + 107d82a590a1c832f048d4f4bf1df61fd2fb3ec8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 419b6aae70b96..0eb6de7313b39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 3.3.2 4.0.1 4.0.1 - 7.0.0-preview1.21613.1 + 7.0.0-preview1.22063.2 2.0.0-alpha.1.21525.11 From 78f275daa73f7e9ccf47cf081c202418ba2c65db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jan 2022 13:12:19 +0000 Subject: [PATCH 04/14] Update dependencies from https://github.com/dotnet/arcade build 20220114.25 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22056.6 -> To Version 2.5.1-beta.22064.25 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dc58b0230da7..c91cfc97227c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness d33e67a6c2cc5fe415917c6f9bd17046a929dcc0 - + https://github.com/dotnet/arcade - ecf92bbdc4354adc1960fa53808e87d91624f9b5 + 511824f9ad21a8bc070b4bad2a95acd119c4afa0 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0eb6de7313b39..97ec205d451ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 2.5.1-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 - 7.0.0-beta.22063.6 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 2.5.1-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 + 7.0.0-beta.22064.25 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 92d09d0ee6115..6f2e7e108db9b 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22063.6", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22063.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22063.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22063.6", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22064.25", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22064.25", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22064.25", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22064.25", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22059.2" From 867e4fbb5f4dfb6cfb511b8a30cb6bda59d163e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jan 2022 13:31:06 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220115.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21613.1 -> To Version 7.0.0-preview1.22065.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c91cfc97227c3..8664d71297d3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,9 +278,9 @@ https://github.com/dotnet/runtime-assets a597df23119faf540d95cebab14b82f084c47384 - + https://github.com/dotnet/roslyn-analyzers - 107d82a590a1c832f048d4f4bf1df61fd2fb3ec8 + c1736d0da9501e135f0410b5a831528f699d6e60 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 97ec205d451ed..525779d53ca90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 3.3.2 4.0.1 4.0.1 - 7.0.0-preview1.22063.2 + 7.0.0-preview1.22065.1 2.0.0-alpha.1.21525.11 From 192e6afed8c2feb0a50fef7ac4427aa38cca6bc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Jan 2022 13:35:25 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/llvm-project build 20220114.2 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21615.1 -> To Version 11.1.0-alpha.1.22064.2 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8664d71297d3f..26b39d50b73d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -170,37 +170,37 @@ https://github.com/dotnet/runtime-assets a597df23119faf540d95cebab14b82f084c47384 - + https://github.com/dotnet/llvm-project - 662aff66999c435aec09c58643e9fd703eadc3e0 + dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c - + https://github.com/dotnet/llvm-project - 662aff66999c435aec09c58643e9fd703eadc3e0 + dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c - + https://github.com/dotnet/llvm-project - 662aff66999c435aec09c58643e9fd703eadc3e0 + dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c - + https://github.com/dotnet/llvm-project - 662aff66999c435aec09c58643e9fd703eadc3e0 + dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c - + https://github.com/dotnet/llvm-project - 662aff66999c435aec09c58643e9fd703eadc3e0 + dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c - + https://github.com/dotnet/llvm-project - 662aff66999c435aec09c58643e9fd703eadc3e0 + dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c - + https://github.com/dotnet/llvm-project - 662aff66999c435aec09c58643e9fd703eadc3e0 + dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c - + https://github.com/dotnet/llvm-project - 662aff66999c435aec09c58643e9fd703eadc3e0 + dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 525779d53ca90..15db638020da7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -183,14 +183,14 @@ 7.0.0-alpha.1.21529.3 - 11.1.0-alpha.1.21615.1 - 11.1.0-alpha.1.21615.1 - 11.1.0-alpha.1.21615.1 - 11.1.0-alpha.1.21615.1 - 11.1.0-alpha.1.21615.1 - 11.1.0-alpha.1.21615.1 - 11.1.0-alpha.1.21615.1 - 11.1.0-alpha.1.21615.1 + 11.1.0-alpha.1.22064.2 + 11.1.0-alpha.1.22064.2 + 11.1.0-alpha.1.22064.2 + 11.1.0-alpha.1.22064.2 + 11.1.0-alpha.1.22064.2 + 11.1.0-alpha.1.22064.2 + 11.1.0-alpha.1.22064.2 + 11.1.0-alpha.1.22064.2 7.0.0-alpha.1.21601.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From 626b0affc47030691f4f2a52a4bbaca444382b4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jan 2022 13:12:54 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/runtime build 20220116.4 Microsoft.NETCore.ILAsm , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.DotNetHost , Microsoft.NETCore.App.Runtime.win-x64 , System.Runtime.CompilerServices.Unsafe , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Text.Json From Version 7.0.0-alpha.1.22059.2 -> To Version 7.0.0-alpha.1.22066.4 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- global.json | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26b39d50b73d4..001be1d183d38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,37 +202,37 @@ https://github.com/dotnet/llvm-project dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c - + https://github.com/dotnet/runtime - a2af6294767b4a3f4c2ce787c5dda2abeeda7a00 + ae2f60c950cc021921fce83c796cbcb5ff96c658 - + https://github.com/dotnet/runtime - a2af6294767b4a3f4c2ce787c5dda2abeeda7a00 + ae2f60c950cc021921fce83c796cbcb5ff96c658 - + https://github.com/dotnet/runtime - a2af6294767b4a3f4c2ce787c5dda2abeeda7a00 + ae2f60c950cc021921fce83c796cbcb5ff96c658 - + https://github.com/dotnet/runtime - a2af6294767b4a3f4c2ce787c5dda2abeeda7a00 + ae2f60c950cc021921fce83c796cbcb5ff96c658 - + https://github.com/dotnet/runtime - a2af6294767b4a3f4c2ce787c5dda2abeeda7a00 + ae2f60c950cc021921fce83c796cbcb5ff96c658 - + https://github.com/dotnet/runtime - a2af6294767b4a3f4c2ce787c5dda2abeeda7a00 + ae2f60c950cc021921fce83c796cbcb5ff96c658 - + https://github.com/dotnet/runtime - a2af6294767b4a3f4c2ce787c5dda2abeeda7a00 + ae2f60c950cc021921fce83c796cbcb5ff96c658 - + https://github.com/dotnet/runtime - a2af6294767b4a3f4c2ce787c5dda2abeeda7a00 + ae2f60c950cc021921fce83c796cbcb5ff96c658 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 15db638020da7..9ed0d06c479da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,12 +72,12 @@ 6.0.0-preview.1.102 - 7.0.0-alpha.1.22059.2 - 7.0.0-alpha.1.22059.2 - 7.0.0-alpha.1.22059.2 + 7.0.0-alpha.1.22066.4 + 7.0.0-alpha.1.22066.4 + 7.0.0-alpha.1.22066.4 3.1.0 - 7.0.0-alpha.1.22059.2 + 7.0.0-alpha.1.22066.4 1.0.0-alpha.1.22060.1 1.0.0-alpha.1.22060.1 1.0.0-alpha.1.22060.1 @@ -120,11 +120,11 @@ 5.0.0 5.0.0 4.9.0-rc2.21473.1 - 7.0.0-alpha.1.22059.2 - 7.0.0-alpha.1.22059.2 + 7.0.0-alpha.1.22066.4 + 7.0.0-alpha.1.22066.4 4.5.4 4.5.0 - 7.0.0-alpha.1.22059.2 + 7.0.0-alpha.1.22066.4 7.0.0-beta.22060.1 7.0.0-beta.22060.1 diff --git a/global.json b/global.json index 6f2e7e108db9b..d62f966e345e3 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22064.25", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22059.2" + "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22066.4" } } From 34b73acd7a7d04fdcf0d1af06670fe5a71555a8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jan 2022 13:24:44 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220116.3 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21613.1 -> To Version 7.0.0-preview1.22066.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 001be1d183d38..216dad13ef016 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,9 +278,9 @@ https://github.com/dotnet/runtime-assets a597df23119faf540d95cebab14b82f084c47384 - + https://github.com/dotnet/roslyn-analyzers - c1736d0da9501e135f0410b5a831528f699d6e60 + c3145214555afda60a74da31f9096a788348e4fc https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9ed0d06c479da..c5c8c09f1cfea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 3.3.2 4.0.1 4.0.1 - 7.0.0-preview1.22065.1 + 7.0.0-preview1.22066.3 2.0.0-alpha.1.21525.11 From 4043386e77694849172f21fb81244e0b0ea55c3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Jan 2022 16:29:04 +0000 Subject: [PATCH 09/14] Update dependencies from https://github.com/dotnet/xharness build 20220117.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22062.1 -> To Version 1.0.0-prerelease.22067.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 015825df43d7a..0e5219042b700 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22062.1", + "version": "1.0.0-prerelease.22067.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 216dad13ef016..09f240e6da3a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,17 +238,17 @@ https://github.com/dotnet/linker 1a6468ff722c8d362f37638989ec01ab9975ac28 - + https://github.com/dotnet/xharness - d33e67a6c2cc5fe415917c6f9bd17046a929dcc0 + 3060cda4543b80824a9238bcd176bb1a5af72044 - + https://github.com/dotnet/xharness - d33e67a6c2cc5fe415917c6f9bd17046a929dcc0 + 3060cda4543b80824a9238bcd176bb1a5af72044 - + https://github.com/dotnet/xharness - d33e67a6c2cc5fe415917c6f9bd17046a929dcc0 + 3060cda4543b80824a9238bcd176bb1a5af72044 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index c5c8c09f1cfea..da0cdd4de39a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -160,9 +160,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22062.1 - 1.0.0-prerelease.22062.1 - 1.0.0-prerelease.22062.1 + 1.0.0-prerelease.22067.1 + 1.0.0-prerelease.22067.1 + 1.0.0-prerelease.22067.1 1.0.2-alpha.0.22060.2 2.4.2-pre.9 2.4.2 From b71cb6657619dda135df9177aa429051fe021e29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jan 2022 13:14:15 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/arcade build 20220117.1 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22056.6 -> To Version 2.5.1-beta.22067.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09f240e6da3a2..9632172bde3c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 3060cda4543b80824a9238bcd176bb1a5af72044 - + https://github.com/dotnet/arcade - 511824f9ad21a8bc070b4bad2a95acd119c4afa0 + 3fb1f4bbc1f2cdd26071764132a3592eceab63fe https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index da0cdd4de39a9..6c0b8a177a864 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 2.5.1-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 - 7.0.0-beta.22064.25 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 2.5.1-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 + 7.0.0-beta.22067.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index d62f966e345e3..3bcf328acdd07 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22064.25", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22064.25", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22064.25", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22064.25", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22067.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22067.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22067.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22067.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22066.4" From 7892010f88ddac820faefbd31aecd19a65b85533 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jan 2022 13:20:04 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/icu build 20220117.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-alpha.1.22060.1 -> To Version 7.0.0-alpha.1.22067.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9632172bde3c1..1a4f3a2fd03e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - aae7d341a8ee7841ed0cb1cf298ab17fe04c187b + 4170ccfbbcada3e22aa4428a84524fabef006e38 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 6c0b8a177a864..2f9b024a604e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,7 +179,7 @@ 7.0.100-1.22053.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.22060.1 + 7.0.0-alpha.1.22067.1 7.0.0-alpha.1.21529.3 From 89260aa5533abf1a7e4558a8ca5110b63379a3b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jan 2022 13:33:25 +0000 Subject: [PATCH 12/14] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220117.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21613.1 -> To Version 7.0.0-preview1.22067.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a4f3a2fd03e3..059e4c1c7b722 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,9 +278,9 @@ https://github.com/dotnet/runtime-assets a597df23119faf540d95cebab14b82f084c47384 - + https://github.com/dotnet/roslyn-analyzers - c3145214555afda60a74da31f9096a788348e4fc + 6c43d213c426cf64c78eb1e9e38e4b9ec6454181 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2f9b024a604e3..ae458a584b2e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 3.3.2 4.0.1 4.0.1 - 7.0.0-preview1.22066.3 + 7.0.0-preview1.22067.1 2.0.0-alpha.1.21525.11 From 4acf3d739451bd6451b66f2c0888771e5cfee53d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jan 2022 13:38:18 +0000 Subject: [PATCH 13/14] Update dependencies from https://github.com/dotnet/llvm-project build 20220117.2 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21615.1 -> To Version 11.1.0-alpha.1.22067.2 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 059e4c1c7b722..f2284e306d9c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -170,37 +170,37 @@ https://github.com/dotnet/runtime-assets a597df23119faf540d95cebab14b82f084c47384 - + https://github.com/dotnet/llvm-project - dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c + 79a6d232058e2c2f1d9e833355b72f07fe342a3b - + https://github.com/dotnet/llvm-project - dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c + 79a6d232058e2c2f1d9e833355b72f07fe342a3b - + https://github.com/dotnet/llvm-project - dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c + 79a6d232058e2c2f1d9e833355b72f07fe342a3b - + https://github.com/dotnet/llvm-project - dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c + 79a6d232058e2c2f1d9e833355b72f07fe342a3b - + https://github.com/dotnet/llvm-project - dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c + 79a6d232058e2c2f1d9e833355b72f07fe342a3b - + https://github.com/dotnet/llvm-project - dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c + 79a6d232058e2c2f1d9e833355b72f07fe342a3b - + https://github.com/dotnet/llvm-project - dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c + 79a6d232058e2c2f1d9e833355b72f07fe342a3b - + https://github.com/dotnet/llvm-project - dfe322fc9038b0e86d46ba504dcdb5a73dde6e5c + 79a6d232058e2c2f1d9e833355b72f07fe342a3b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ae458a584b2e6..6f6eab27a456f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -183,14 +183,14 @@ 7.0.0-alpha.1.21529.3 - 11.1.0-alpha.1.22064.2 - 11.1.0-alpha.1.22064.2 - 11.1.0-alpha.1.22064.2 - 11.1.0-alpha.1.22064.2 - 11.1.0-alpha.1.22064.2 - 11.1.0-alpha.1.22064.2 - 11.1.0-alpha.1.22064.2 - 11.1.0-alpha.1.22064.2 + 11.1.0-alpha.1.22067.2 + 11.1.0-alpha.1.22067.2 + 11.1.0-alpha.1.22067.2 + 11.1.0-alpha.1.22067.2 + 11.1.0-alpha.1.22067.2 + 11.1.0-alpha.1.22067.2 + 11.1.0-alpha.1.22067.2 + 11.1.0-alpha.1.22067.2 7.0.0-alpha.1.21601.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From 8630e6ec0866b1c30b58ad16f2f17a5282fe9ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 18 Jan 2022 20:13:29 +0100 Subject: [PATCH 14/14] Update arcade --- eng/Version.Details.xml | 76 ++++++++++----------- eng/Versions.props | 30 ++++---- eng/common/templates/steps/source-build.yml | 2 +- global.json | 8 +-- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2284e306d9c1..16f9b79520e58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 3060cda4543b80824a9238bcd176bb1a5af72044 - + https://github.com/dotnet/arcade - 3fb1f4bbc1f2cdd26071764132a3592eceab63fe + 9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6f6eab27a456f..45d310fce83fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 2.5.1-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 - 7.0.0-beta.22067.1 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 2.5.1-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 + 7.0.0-beta.22068.3 6.0.0-preview.1.102 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f1411..d85d6d07d5c7b 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -23,7 +23,7 @@ steps: # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those # changes. - $internalRestoreArgs= + internalRestoreArgs= if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then # Temporarily work around https://github.com/dotnet/arcade/issues/7709 chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh diff --git a/global.json b/global.json index 3bcf328acdd07..6e753c749b04a 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22067.1", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22067.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22067.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22067.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22068.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22068.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22068.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22068.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22066.4"