From 946eb3a3becbdec3ce83a7c67a668c6df2c15e35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 19:18:01 +0000 Subject: [PATCH 01/52] Update dependencies from https://github.com/dotnet/arcade build 20220406.10 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22206.10 --- eng/Version.Details.xml | 76 +++++----- eng/Versions.props | 32 ++-- eng/common/init-tools-native.ps1 | 137 ++++++++++++------ .../templates/job/publish-build-assets.yml | 50 +++++-- eng/common/templates/jobs/jobs.yml | 11 +- .../templates/post-build/post-build.yml | 76 +++++----- global.json | 10 +- 7 files changed, 241 insertions(+), 151 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d45f4767c5f825..71fa6c180edfbf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness f9a28aefa80424a69f3ce16e845c4e01e5d8c17e - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + 549523c3fc8929da1a3073d1a97f298e0d1dc342 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0fa57c54d4dfaf..eaf005e3d6f2ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 2.5.1-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 - 7.0.0-beta.22179.1 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 2.5.1-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 + 7.0.0-beta.22206.10 6.0.0-preview.1.102 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index db830c00a6f8d8..413adea4365b12 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -31,6 +31,10 @@ Wait time between retry attempts in seconds .PARAMETER GlobalJsonFile File path to global.json file +.PARAMETER PathPromotion +Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) +or break the build if a native tool is not found on the path (on a local dev machine) + .NOTES #> [CmdletBinding(PositionalBinding=$false)] @@ -41,7 +45,8 @@ Param ( [switch] $Force = $False, [int] $DownloadRetries = 5, [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile + [string] $GlobalJsonFile, + [switch] $PathPromotion ) if (!$GlobalJsonFile) { @@ -77,53 +82,97 @@ try { ConvertFrom-Json | Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false + if ($PathPromotion -eq $True) { + if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + if ($ToolVersion -eq "latest") { + $ToolVersion = "" + } + $ArcadeToolsDirectory = "C:\arcade-tools" + if (Test-Path $ArcadeToolsDirectory -eq $False) { + Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." + exit 1 } - if ($showNativeToolsWarning) { - Write-Warning $errMsg + $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0] + if ([string]::IsNullOrWhiteSpace($ToolDirectory)) { + Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." + exit 1 } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - exit 1 + $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" + if (Test-Path -Path "$BinPathFile" -eq $False) { + Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." + exit 1 + } + $BinPath = Get-Content "$BinPathFile" + Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..." + Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)" + } + } + exit 0 + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + } } + exit 0 + } + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } + + if ($Verbose) { + $LocalInstallerArguments += @{ Verbose = $True } + } + if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { + if($Force) { + $LocalInstallerArguments += @{ Force = $True } + } + } + if ($Clean) { + $LocalInstallerArguments += @{ Clean = $True } + } + + Write-Verbose "Installing $ToolName version $ToolVersion" + Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" + & $InstallerPath @LocalInstallerArguments + if ($LASTEXITCODE -Ne "0") { + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + $showNativeToolsWarning = $true + if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { + $showNativeToolsWarning = $false + } + if ($showNativeToolsWarning) { + Write-Warning $errMsg + } + $toolInstallationFailure = $true + } else { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host $errMsg + exit 1 + } + } + } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host 'Native tools bootstrap failed' + exit 1 } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 } } else { diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147116f0..1cbb6a0c560038 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -23,23 +23,33 @@ parameters: # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing publishUsingPipelines: false + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} - displayName: Publish to Build Asset Registry + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry pool: ${{ parameters.pool }} variables: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - name: _BuildConfig - value: ${{ parameters.configuration }} - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - name: runCodesignValidationInjection value: false + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates/post-build/common-variables.yml steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -52,14 +62,13 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@0 - - task: PowerShell@2 - displayName: Enable cross-org NuGet feed authentication - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) + - task: PowerShell@2 + displayName: Enable cross-org NuGet feed authentication + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) - task: PowerShell@2 displayName: Publish Build Assets @@ -70,7 +79,6 @@ jobs: /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -114,7 +122,25 @@ jobs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs - + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc436dd..2cca53c2d1d531 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -27,6 +27,13 @@ parameters: # Optional: Override automatically derived dependsOn value for "publish build assets" job publishBuildAssetsDependsOn: '' + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + # Optional: should run as a public build even in the internal project # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. runAsPublic: false @@ -68,7 +75,6 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - template: ../job/publish-build-assets.yml parameters: @@ -94,4 +100,7 @@ jobs: runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 2f176571f020cf..5a9056f6b2fb50 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -82,6 +82,11 @@ parameters: default: - Validate + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + stages: - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - stage: Validate @@ -99,7 +104,7 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + ${{ else }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 @@ -136,7 +141,7 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + ${{ else }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: @@ -196,7 +201,7 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + ${{ else }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: @@ -235,43 +240,44 @@ stages: artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} -- 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: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - 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 }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + ${{ else }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@0 - - 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 - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + - 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 + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file diff --git a/global.json b/global.json index bb908a3d373dd8..ffc4166135c0ba 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "6.0.100", + "version": "7.0.100-preview.2.22153.17", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100" + "dotnet": "7.0.100-preview.2.22153.17" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22179.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22206.10", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22206.10", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.3.22171.1" From c0beb886d66517975168bb76101e2b32be6c645f Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 8 Apr 2022 17:26:16 -0500 Subject: [PATCH 02/52] Move tools and apps to net7.0 --- Directory.Build.props | 4 ++-- .../ILStrip/AssemblyStripper/AssemblyStripper.csproj | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 2ec01ea57e6b7f..2e6a7b6c0f594e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -53,7 +53,7 @@ net$(NetCoreAppCurrentVersion) net6.0 - 6.0 + 7.0 net$(NetCoreAppToolCurrentVersion) $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) @@ -61,7 +61,7 @@ $(NetCoreAppLatestStableVersion).0 net$(NetCoreAppLatestStableVersion) - 6.0 + 7.0 net$(AspNetCoreAppCurrentVersion) net462 diff --git a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj index 439b5b8b21b98c..2eb8a61b6330fb 100644 --- a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj +++ b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj @@ -4,11 +4,10 @@ false disable - - $(NoWarn),CS0618,CS0649,SYSLIB0003 + $(NoWarn),CS0618,CS0649,SYSLIB0003,SYSLIB0037 false From 7b6303a97e15f6829a7f290a9616905c09de8c00 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 8 Apr 2022 17:32:55 -0500 Subject: [PATCH 03/52] Update Microsoft.DotNet.HotReload.Utils.Generator.BuildTool to 1.1.0-alpha.0.22206.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 71fa6c180edfbf..6fdbd67939a5b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -270,9 +270,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization a44e13253c25ec42c4700d4d7ba6f84d9751a387 - + https://github.com/dotnet/hotreload-utils - 47d85fbfba08b6b31ec5e2f0a18f239b880ce084 + f025eb61d880f837392c1b3d7112c1342e44f9c0 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index eaf005e3d6f2ee..3f13102507a7c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,7 +162,7 @@ 1.0.0-prerelease.22206.1 1.0.0-prerelease.22206.1 1.0.0-prerelease.22206.1 - 1.0.2-alpha.0.22178.2 + 1.1.0-alpha.0.22206.1 2.4.2-pre.22 0.12.0-pre.20 2.4.2 From 63e8fa7b0f209a8b36821f25376cb5036097053f Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 8 Apr 2022 17:48:37 -0500 Subject: [PATCH 04/52] Pass cancellation token to ReadToEndAsync --- src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs index f398ce0a1a29eb..d5b818df353ede 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs @@ -1634,7 +1634,7 @@ private async Task OnGetScriptSource(MessageId msg_id, string script_id, C return false; using (var reader = new StreamReader(data)) - source = await reader.ReadToEndAsync(); + source = await reader.ReadToEndAsync(token); } SendResponse(msg_id, Result.OkFromObject(new { scriptSource = source }), token); } From efadec051f1919228e684120e5218bb1e8e18e30 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 8 Apr 2022 18:00:45 -0500 Subject: [PATCH 05/52] Update WasmApp.LocalBuild.props to net7.0 too, whoops --- src/mono/wasm/build/WasmApp.LocalBuild.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index 939d6ce4eef85a..6cbb86d94e7f51 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -22,7 +22,7 @@ - <_TargetFrameworkForNETCoreTasks>net6.0 + <_TargetFrameworkForNETCoreTasks>net7.0 false From 2b0dde028c00c58b974637d7b4581b986da3905f Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Fri, 8 Apr 2022 19:28:21 -0400 Subject: [PATCH 06/52] Fix windows build The generated path property for `Pkgoptimization_windows_nt-x86_PGO_CoreCLR` seems to have a trailing `\` now, on windows, which breaks the quoted use of the property: `"-DCLR_CMAKE_OPTDATA_PATH="D:\a\_work\1\s\.packages\optimization.windows_nt-x86.pgo.coreclr\1.0.0-prerelease.22121.2\""` Since this is a directory path being passed, it should be safe to always trim the trailing `\`. This manifests as: ``` Calling "D:\a\_work\1\s\src\coreclr\..\..\eng\native\gen-buildsys.cmd" "D:\a\_work\1\s\src\coreclr" "D:\a\_work\1\s\src\coreclr\..\..\artifacts\obj\coreclr\windows.x64.Release" vs2019 x64 "-DCMAKE_BUILD_TYPE=Release" "-DCLR_CMAKE_TARGET_ARCH=x64" "-DCLR_CMAKE_TARGET_OS=windows" "-DCLR_CMAKE_PGO_INSTRUMENT=0" "-DCLR_CMAKE_OPTDATA_PATH="D:\a\_work\1\s\.packages\optimization.windows_nt-x64.pgo.coreclr\1.0.0-prerelease.22121.2\"" "-DCLR_CMAKE_PGO_OPTIMIZE=1" CMake Warning: No source or binary directory provided. Both will be assumed to be the same as the current working directory, but note that this warning will become a fatal error in future CMake releases. ``` .. and .. ``` CMake Warning: Manually-specified variables were not used by the project: CLR_CMAKE_OPTDATA_PATH ``` and eventually: ``` ##[error]BUILD: Error: unable to find generated native component build project ``` --- eng/nativepgo.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/nativepgo.targets b/eng/nativepgo.targets index e3db6f980c5f8a..e6d58a33994fff 100644 --- a/eng/nativepgo.targets +++ b/eng/nativepgo.targets @@ -44,7 +44,7 @@ - $(%(Identity)) + $(%(Identity).TrimEnd('\\')) From cab4323c30e4ae2e5510e17f901f27e1b1db60b8 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Fri, 8 Apr 2022 20:34:27 -0400 Subject: [PATCH 07/52] Update target framework for some test projects --- .../LibraryWithResources/LibraryWithResources.csproj | 2 +- src/tests/Common/ILTestRunner/ILTestRunner.csproj | 2 +- .../JIT/Regression/JitBlue/Runtime_60035/Runtime_60035.csproj | 2 +- .../GenericContext/Generator/generatetest.csproj | 2 +- .../TypeHierarchy/Generator/generatetest.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj b/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj index 5198d9c2109d4e..c6c44c64130006 100644 --- a/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj +++ b/src/tests/BuildWasmApps/testassets/SatelliteAssemblyFromProjectRef/LibraryWithResources/LibraryWithResources.csproj @@ -1,5 +1,5 @@ - net6.0 + net7.0 diff --git a/src/tests/Common/ILTestRunner/ILTestRunner.csproj b/src/tests/Common/ILTestRunner/ILTestRunner.csproj index bbb4b7f2a7c290..1b8c552be2992d 100644 --- a/src/tests/Common/ILTestRunner/ILTestRunner.csproj +++ b/src/tests/Common/ILTestRunner/ILTestRunner.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + $(NetCoreAppCurrent) enable enable true diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_60035/Runtime_60035.csproj b/src/tests/JIT/Regression/JitBlue/Runtime_60035/Runtime_60035.csproj index 5f1746c4cabc37..1630530dcbe918 100644 --- a/src/tests/JIT/Regression/JitBlue/Runtime_60035/Runtime_60035.csproj +++ b/src/tests/JIT/Regression/JitBlue/Runtime_60035/Runtime_60035.csproj @@ -3,7 +3,7 @@ None True Exe - net6.0 + $(NetCoreAppCurrent) diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/generatetest.csproj b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/generatetest.csproj index e1e7c5ee5fd625..ed7a5a98dd143c 100644 --- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/generatetest.csproj +++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/generatetest.csproj @@ -1,6 +1,6 @@ Exe - net6.0 + $(NetCoreAppCurrent) diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/TypeHierarchy/Generator/generatetest.csproj b/src/tests/Loader/classloader/StaticVirtualMethods/TypeHierarchy/Generator/generatetest.csproj index e1e7c5ee5fd625..ed7a5a98dd143c 100644 --- a/src/tests/Loader/classloader/StaticVirtualMethods/TypeHierarchy/Generator/generatetest.csproj +++ b/src/tests/Loader/classloader/StaticVirtualMethods/TypeHierarchy/Generator/generatetest.csproj @@ -1,6 +1,6 @@ Exe - net6.0 + $(NetCoreAppCurrent) From 5ff1cad55a829cfac1c4c23137502be8c9149a76 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Fri, 8 Apr 2022 19:51:45 -0700 Subject: [PATCH 08/52] Bump SDK to 7.0.100-preview.4.22204.1 Mirror version used in aspnetcore --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index ffc4166135c0ba..66e222d03c3fbb 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "7.0.100-preview.2.22153.17", + "version": "7.0.100-preview.4.22204.1", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.100-preview.2.22153.17" + "dotnet": "7.0.100-preview.4.22204.1" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10", From 60fe29344097fdfd7b76ec377f8013c6100240e1 Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Sun, 10 Apr 2022 20:19:26 -0700 Subject: [PATCH 09/52] Bump installer tests to 7.0 targetting packs --- eng/targetingpacks.targets | 6 ++---- .../tests/Assets/TestUtils/TestProjects.targets | 16 ++++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 0505ecdb7dd280..1c9c576e649dff 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -22,8 +22,6 @@ false false false - - <_AppHostBaselinePackVersion Condition="'$(UseLocalAppHostPack)' != 'true'">6.0.3 @@ -46,7 +44,7 @@ RuntimePackRuntimeIdentifiers="linux-arm;linux-armv6;linux-arm64;linux-musl-arm64;linux-loongarch64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;browser-wasm;ios-arm64;ios-arm;iossimulator-arm64;iossimulator-x64;iossimulator-x86;tvos-arm64;tvossimulator-arm64;tvossimulator-x64;android-arm64;android-arm;android-x64;android-x86" RuntimePackLabels="Mono" Condition="'@(KnownRuntimePack)' == '' or !@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))"/> - - + - - - - 7.0 - - From b28723de52d73c225b70e460e2b946b3fae5e53c Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Mon, 11 Apr 2022 01:54:39 -0700 Subject: [PATCH 10/52] Test not adding KnownFrameworkReference --- src/installer/tests/Assets/TestUtils/TestProjects.targets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.targets b/src/installer/tests/Assets/TestUtils/TestProjects.targets index eca3239cafbcfd..6c215a9b123553 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.targets +++ b/src/installer/tests/Assets/TestUtils/TestProjects.targets @@ -4,7 +4,8 @@ provides basic info needed for restore and build with the vanilla SDK. --> - + From 6bc1c947068089879d448a67aeedd59caaa9d601 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Mon, 11 Apr 2022 10:48:07 -0700 Subject: [PATCH 11/52] Update debpkg image --- eng/pipelines/installer/jobs/base-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 54825771d8a0d6..9864759fffb291 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -23,7 +23,7 @@ parameters: pgoType: '' packageDistroList: - - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-debpkg-e5cf912-20175003025046 + - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg-20220408155542-cfdd435 packageType: deb packagingArgs: /p:BuildDebPackage=true - image: mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-c982313-20174116044113 From 324b116a9f54e7c244334f1e41882a4049c18765 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Mon, 11 Apr 2022 10:50:11 -0700 Subject: [PATCH 12/52] Remove workaround that adds net7 tfm for installer tests --- .../Assets/TestUtils/TestProjects.targets | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.targets b/src/installer/tests/Assets/TestUtils/TestProjects.targets index 6c215a9b123553..813a49ed13c521 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.targets +++ b/src/installer/tests/Assets/TestUtils/TestProjects.targets @@ -3,22 +3,4 @@ This file is imported by the test projects from the artifacts dir or the src/installer/tests dir. It provides basic info needed for restore and build with the vanilla SDK. --> - - - - From 96f4dfcd2936f534bfc6b343099b728386fd8005 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 11 Apr 2022 22:40:15 +0000 Subject: [PATCH 13/52] [wasm] Debugger tests - always use the same sdk on helix, as the one .. used for building. This failed when `global.json` specified a preview4 sdk, which was used to build the tests. But the built tests (including the preview4 testhost) were send to helix with the preview2 (version set by arcade - `DotNetCliVersion`), which causes: ``` Testhost process exited with error: It was not possible to find any compatible framework version The framework 'Microsoft.NETCore.App', version '7.0.0-preview.4.22201.3' (x64) was not found. - The following frameworks were found: 7.0.0-preview.2.22152.2 at [C:\helix\work\correlation\dotnet-cli\shared\Microsoft.NETCore.App] You can resolve the problem by installing the specified framework and/or SDK. ``` --- src/libraries/sendtohelix-wasm.targets | 2 ++ src/libraries/sendtohelixhelp.proj | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index cdd77a64d0af62..128731a346e6a6 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -91,6 +91,8 @@ true + + true diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 5b4e1d4831f1ac..14b310a3331c89 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -143,11 +143,6 @@ sdk - - $([System.IO.File]::ReadAllText('$(RepoRoot)global.json')) - $([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F<="dotnet": ").*(%3F=")')) - - @@ -155,6 +150,11 @@ + + + $([System.IO.File]::ReadAllText('$(RepoRoot)global.json')) + $([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F<="dotnet": ").*(%3F=")')) + @(HelixPreCommand) From 4838287563ef11c5f0e18b74b6da3fde8fa50d90 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Mon, 11 Apr 2022 19:12:53 -0700 Subject: [PATCH 14/52] Also update the rpmpkg job --- eng/pipelines/installer/jobs/base-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 9864759fffb291..eff31dd34eb6df 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -26,7 +26,7 @@ parameters: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg-20220408155542-cfdd435 packageType: deb packagingArgs: /p:BuildDebPackage=true - - image: mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-c982313-20174116044113 + - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20220405201321-9b5bbc2 packageType: rpm packagingArgs: /p:BuildRpmPackage=true From 1111b83098f45a44a2deb25ed39fa00a275e4986 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Apr 2022 12:21:23 +0000 Subject: [PATCH 15/52] Update dependencies from https://github.com/dotnet/arcade build 20220411.6 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22211.6 --- eng/Version.Details.xml | 76 ++++++++++++++++++------------------ eng/Versions.props | 32 +++++++-------- eng/common/dotnet-install.sh | 4 +- global.json | 6 +-- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fdbd67939a5b4..bce9185d2acb54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness f9a28aefa80424a69f3ce16e845c4e01e5d8c17e - + https://github.com/dotnet/arcade - 549523c3fc8929da1a3073d1a97f298e0d1dc342 + d2715c6ef2c3e2847925250f0a8012344fbb9846 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 3f13102507a7c3..5c5a7897991b98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 2.5.1-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 - 7.0.0-beta.22206.10 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 2.5.1-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 + 7.0.0-beta.22211.6 6.0.0-preview.1.102 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 5c94e98632a0a7..abd045a3247f02 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; loongarch64) @@ -64,7 +64,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index 66e222d03c3fbb..95ec1b68a30370 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.4.22204.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22206.10", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22206.10", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22211.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22211.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22211.6", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.3.22171.1" From 156b95d7972eaebe980f747e390bfb5a0d3d73e6 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Tue, 12 Apr 2022 16:18:33 +0000 Subject: [PATCH 16/52] Disable EMSDK wasm.build.tests due to https://github.com/dotnet/arcade/issues/9025 --- src/libraries/sendtohelix.proj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index 3b938a01682001..6ebb65f106ef4c 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -77,7 +77,9 @@ - <_TestUsingWorkloadsValues Include="true;false" /> + + + <_TestUsingWorkloadsValues Include="true" /> <_BuildWasmAppsProjectsToBuild Include="$(PerScenarioProjectFile)"> $(_PropertiesToPass);Scenario=BuildWasmApps;TestArchiveRuntimeFile=$(TestArchiveRuntimeFile);TestUsingWorkloads=%(_TestUsingWorkloadsValues.Identity) From 9c69e063bbcb7f753d422536f0c4765e97bbe329 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Apr 2022 12:25:19 +0000 Subject: [PATCH 17/52] Update dependencies from https://github.com/dotnet/arcade build 20220412.2 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22212.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30e9b9dd61caaf..131691d82f81a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness f9a28aefa80424a69f3ce16e845c4e01e5d8c17e - + https://github.com/dotnet/arcade - d2715c6ef2c3e2847925250f0a8012344fbb9846 + 2e24ed0bdbd4e3b42c296503955c837bb0b08372 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2b78427a500cd1..0625f08eb509b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 2.5.1-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 - 7.0.0-beta.22211.6 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 2.5.1-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 + 7.0.0-beta.22212.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 95ec1b68a30370..b47a06c208bb7d 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.4.22204.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22211.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22211.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22211.6", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22212.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22212.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22212.2", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.3.22171.1" From f1f3c6b01ddf38ca5df2ad490a04fe8383d6e23f Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Wed, 13 Apr 2022 13:37:53 -0700 Subject: [PATCH 18/52] Use VS preview pools for Windows build jobs --- eng/pipelines/common/xplat-setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index e6ac905afb0648..89db52e2674385 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -135,12 +135,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022.Pre # Public Windows Build Pool ${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022.Pre.Open ${{ if eq(parameters.helixQueuesTemplate, '') }}: From 37ee81d09a52ff18ebf9555291cd1c5ef6e863b4 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Wed, 13 Apr 2022 13:38:36 -0700 Subject: [PATCH 19/52] Use preview 3 SDK --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index b47a06c208bb7d..5cbe99d711c626 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "7.0.100-preview.4.22204.1", + "version": "7.0.100-preview.3.22179.4", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.100-preview.4.22204.1" + "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22212.2", From 83b7c416e7e25c2f4915bb1352d95c27b48a644c Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Wed, 13 Apr 2022 13:59:03 -0700 Subject: [PATCH 20/52] Fix queue name --- eng/pipelines/common/xplat-setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 89db52e2674385..28648302614dcd 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -135,12 +135,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022.Pre + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre # Public Windows Build Pool ${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022.Pre.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open ${{ if eq(parameters.helixQueuesTemplate, '') }}: From 9ceaf599041c087d7ed740e6d76b5fd83dd5b8ab Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Wed, 13 Apr 2022 16:26:44 -0700 Subject: [PATCH 21/52] Disable warning C4679 in IJW tests --- eng/native/ijw/IJW.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/native/ijw/IJW.cmake b/eng/native/ijw/IJW.cmake index 3de8a673c8be00..134fcd64123033 100644 --- a/eng/native/ijw/IJW.cmake +++ b/eng/native/ijw/IJW.cmake @@ -32,7 +32,7 @@ if (CLR_CMAKE_HOST_WIN32) endfunction() # 4365 - signed/unsigned mismatch - add_compile_options(/wd4365) + add_compile_options(/wd4365 /wd4679) # IJW add_compile_options(/clr:netcore) From f0ad0803efc65a356a7da5ab507ea1402932e48d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Apr 2022 12:21:54 +0000 Subject: [PATCH 22/52] Update dependencies from https://github.com/dotnet/arcade build 20220413.2 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22213.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 131691d82f81a4..542052f984e5dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness f9a28aefa80424a69f3ce16e845c4e01e5d8c17e - + https://github.com/dotnet/arcade - 2e24ed0bdbd4e3b42c296503955c837bb0b08372 + 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0625f08eb509b7..7136e6b9cb7487 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 2.5.1-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 - 7.0.0-beta.22212.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 2.5.1-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 + 7.0.0-beta.22213.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 5cbe99d711c626..3fc35c129757a4 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22212.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22212.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22212.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22213.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22213.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22213.2", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.3.22171.1" From 2eecd8105a03829dd2986762699e07716ca6e1a6 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 14 Apr 2022 15:30:51 -0400 Subject: [PATCH 23/52] Update llvm dependencies Cherry picked from https://github.com/dotnet/runtime/pull/67773/commits/d64b5ac7f4fda2eddce990d9fa862869d53ce39c Adding this in the hope that the following build errors, possibly caused by an ABI break in the compiler upgrade, will be fixed: ``` FAILED: mono/mini/mono-aot-cross.exe cmd.exe /C "cd . && "C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -E vs_link_exe --intdir=mono\mini\CMakeFiles\mono-sgen.dir --rc=C:\PROGRA~2\WI3CF2~1\10\bin\100220~1.0\x86\rc.exe --mt=C:\PROGRA~2\WI3CF2~1\10\bin\100220~1.0\x86\mt.exe --manifests -- C:\PROGRA~1\MICROS~1\2022\Preview\VC\Tools\MSVC\1432~1.313\bin\Hostx86\x64\link.exe /nologo mono\mini\CMakeFiles\mono-sgen.dir\main-sgen.c.obj mono\mini\CMakeFiles\mono-sgen.dir\D_\a\_work\1\s\artifacts\obj\NativeVersion.rc.res /out:mono\mini\mono-aot-cross.exe /implib:mono\mini\mono-aot-cross.lib /pdb:mono\mini\mono-aot-cross.pdb /version:0.0 /machine:x64 /INCREMENTAL:NO /subsystem:console /STACK:0x800000 /LTCG /DEBUG /OPT:REF /OPT:ICF /OPT:NOICF mono\mini\monosgen-2.0.lib bcrypt.lib Mswsock.lib ws2_32.lib psapi.lib version.lib advapi32.lib winmm.lib kernel32.lib llvm\lib\LLVMOrcJIT.lib llvm\lib\LLVMPasses.lib llvm\lib\LLVMCoroutines.lib llvm\lib\LLVMipo.lib llvm\lib\LLVMInstrumentation.lib llvm\lib\LLVMVectorize.lib llvm\lib\LLVMScalarOpts.lib llvm\lib\LLVMLinker.lib llvm\lib\LLVMIRReader.lib llvm\lib\LLVMAsmParser.lib llvm\lib\LLVMInstCombine.lib llvm\lib\LLVMFrontendOpenMP.lib llvm\lib\LLVMAggressiveInstCombine.lib llvm\lib\LLVMTransformUtils.lib llvm\lib\LLVMOrcError.lib llvm\lib\LLVMJITLink.lib llvm\lib\LLVMMCJIT.lib llvm\lib\LLVMExecutionEngine.lib llvm\lib\LLVMTarget.lib llvm\lib\LLVMRuntimeDyld.lib llvm\lib\LLVMBitWriter.lib llvm\lib\LLVMAnalysis.lib llvm\lib\LLVMProfileData.lib llvm\lib\LLVMObject.lib llvm\lib\LLVMTextAPI.lib llvm\lib\LLVMMCParser.lib llvm\lib\LLVMMC.lib llvm\lib\LLVMDebugInfoCodeView.lib llvm\lib\LLVMDebugInfoMSF.lib llvm\lib\LLVMBitReader.lib llvm\lib\LLVMCore.lib llvm\lib\LLVMRemarks.lib llvm\lib\LLVMBitstreamReader.lib llvm\lib\LLVMBinaryFormat.lib llvm\lib\LLVMSupport.lib llvm\lib\LLVMDemangle.lib psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib psapi.lib version.lib winmm.lib kernel32.lib llvm\lib\LLVMOrcJIT.lib llvm\lib\LLVMPasses.lib llvm\lib\LLVMCoroutines.lib llvm\lib\LLVMipo.lib llvm\lib\LLVMInstrumentation.lib llvm\lib\LLVMVectorize.lib llvm\lib\LLVMScalarOpts.lib llvm\lib\LLVMLinker.lib llvm\lib\LLVMIRReader.lib llvm\lib\LLVMAsmParser.lib llvm\lib\LLVMInstCombine.lib llvm\lib\LLVMFrontendOpenMP.lib llvm\lib\LLVMAggressiveInstCombine.lib llvm\lib\LLVMTransformUtils.lib llvm\lib\LLVMOrcError.lib llvm\lib\LLVMJITLink.lib llvm\lib\LLVMMCJIT.lib llvm\lib\LLVMExecutionEngine.lib llvm\lib\LLVMTarget.lib llvm\lib\LLVMRuntimeDyld.lib llvm\lib\LLVMBitWriter.lib llvm\lib\LLVMAnalysis.lib llvm\lib\LLVMProfileData.lib llvm\lib\LLVMObject.lib llvm\lib\LLVMTextAPI.lib llvm\lib\LLVMMCParser.lib llvm\lib\LLVMMC.lib llvm\lib\LLVMDebugInfoCodeView.lib llvm\lib\LLVMDebugInfoMSF.lib llvm\lib\LLVMBitReader.lib llvm\lib\LLVMCore.lib llvm\lib\LLVMRemarks.lib llvm\lib\LLVMBitstreamReader.lib llvm\lib\LLVMBinaryFormat.lib llvm\lib\LLVMSupport.lib llvm\lib\LLVMDemangle.lib shell32.lib ole32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib && cd ." LINK: command "C:\PROGRA~1\MICROS~1\2022\Preview\VC\Tools\MSVC\1432~1.313\bin\Hostx86\x64\link.exe /nologo mono\mini\CMakeFiles\mono-sgen.dir\main-sgen.c.obj mono\mini\CMakeFiles\mono-sgen.dir\D_\a\_work\1\s\artifacts\obj\NativeVersion.rc.res /out:mono\mini\mono-aot-cross.exe /implib:mono\mini\mono-aot-cross.lib /pdb:mono\mini\mono-aot-cross.pdb /version:0.0 /machine:x64 /INCREMENTAL:NO /subsystem:console /STACK:0x800000 /LTCG /DEBUG /OPT:REF /OPT:ICF /OPT:NOICF mono\mini\monosgen-2.0.lib bcrypt.lib Mswsock.lib ws2_32.lib psapi.lib version.lib advapi32.lib winmm.lib kernel32.lib llvm\lib\LLVMOrcJIT.lib llvm\lib\LLVMPasses.lib llvm\lib\LLVMCoroutines.lib llvm\lib\LLVMipo.lib llvm\lib\LLVMInstrumentation.lib llvm\lib\LLVMVectorize.lib llvm\lib\LLVMScalarOpts.lib llvm\lib\LLVMLinker.lib llvm\lib\LLVMIRReader.lib llvm\lib\LLVMAsmParser.lib llvm\lib\LLVMInstCombine.lib llvm\lib\LLVMFrontendOpenMP.lib llvm\lib\LLVMAggressiveInstCombine.lib llvm\lib\LLVMTransformUtils.lib llvm\lib\LLVMOrcError.lib llvm\lib\LLVMJITLink.lib llvm\lib\LLVMMCJIT.lib llvm\lib\LLVMExecutionEngine.lib llvm\lib\LLVMTarget.lib llvm\lib\LLVMRuntimeDyld.lib llvm\lib\LLVMBitWriter.lib llvm\lib\LLVMAnalysis.lib llvm\lib\LLVMProfileData.lib llvm\lib\LLVMObject.lib llvm\lib\LLVMTextAPI.lib llvm\lib\LLVMMCParser.lib llvm\lib\LLVMMC.lib llvm\lib\LLVMDebugInfoCodeView.lib llvm\lib\LLVMDebugInfoMSF.lib llvm\lib\LLVMBitReader.lib llvm\lib\LLVMCore.lib llvm\lib\LLVMRemarks.lib llvm\lib\LLVMBitstreamReader.lib llvm\lib\LLVMBinaryFormat.lib llvm\lib\LLVMSupport.lib llvm\lib\LLVMDemangle.lib psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib psapi.lib version.lib winmm.lib kernel32.lib llvm\lib\LLVMOrcJIT.lib llvm\lib\LLVMPasses.lib llvm\lib\LLVMCoroutines.lib llvm\lib\LLVMipo.lib llvm\lib\LLVMInstrumentation.lib llvm\lib\LLVMVectorize.lib llvm\lib\LLVMScalarOpts.lib llvm\lib\LLVMLinker.lib llvm\lib\LLVMIRReader.lib llvm\lib\LLVMAsmParser.lib llvm\lib\LLVMInstCombine.lib llvm\lib\LLVMFrontendOpenMP.lib llvm\lib\LLVMAggressiveInstCombine.lib llvm\lib\LLVMTransformUtils.lib llvm\lib\LLVMOrcError.lib llvm\lib\LLVMJITLink.lib llvm\lib\LLVMMCJIT.lib llvm\lib\LLVMExecutionEngine.lib llvm\lib\LLVMTarget.lib llvm\lib\LLVMRuntimeDyld.lib llvm\lib\LLVMBitWriter.lib llvm\lib\LLVMAnalysis.lib llvm\lib\LLVMProfileData.lib llvm\lib\LLVMObject.lib llvm\lib\LLVMTextAPI.lib llvm\lib\LLVMMCParser.lib llvm\lib\LLVMMC.lib llvm\lib\LLVMDebugInfoCodeView.lib llvm\lib\LLVMDebugInfoMSF.lib llvm\lib\LLVMBitReader.lib llvm\lib\LLVMCore.lib llvm\lib\LLVMRemarks.lib llvm\lib\LLVMBitstreamReader.lib llvm\lib\LLVMBinaryFormat.lib llvm\lib\LLVMSupport.lib llvm\lib\LLVMDemangle.lib shell32.lib ole32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /MANIFEST /MANIFESTFILE:mono\mini\mono-aot-cross.exe.manifest" failed (exit code 1120) with the following output: LLVMCore.lib(Dominators.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMCore.lib(IRPrintingPasses.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMCore.lib(SafepointIRVerifier.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMSupport.lib(ManagedStatic.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMAnalysis.lib(TargetLibraryInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMAnalysis.lib(AssumptionCache.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMAnalysis.lib(LoopAccessAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMCore.lib(Verifier.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMAnalysis.lib(StackSafetyAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMAnalysis.lib(TargetTransformInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_begin_initialize LLVMAnalysis.lib(TypeBasedAliasAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(ProfileSummaryInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(RegionPrinter.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(ScalarEvolutionAliasAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(ScalarEvolution.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(ScopedNoAliasAA.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(OptimizationRemarkEmitter.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(PhiValues.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(PostDominators.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(RegionInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(MemorySSA.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(ModuleDebugInfoPrinter.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(MustExecute.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(ObjCARCAliasAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(LoopInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(MemDepPrinter.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(MemDerefPrinter.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(MemoryDependenceAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(LazyBranchProbabilityInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(LazyValueInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(LegacyDivergenceAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(Lint.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(InstCount.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(IntervalPartition.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(LoopPass.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(LazyBlockFrequencyInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(DomPrinter.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(DominanceFrontier.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(GlobalsModRef.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(IVUsers.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(CostModel.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(Delinearization.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(DemandedBits.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(DependenceAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(CFLAndersAliasAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(CFLSteensAliasAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(CallPrinter.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(CallGraph.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(AliasSetTracker.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(BasicAliasAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(BlockFrequencyInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(BranchProbabilityInfo.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(ModuleSummaryAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(CFGPrinter.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(AliasAnalysisEvaluator.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete LLVMAnalysis.lib(AliasAnalysis.cpp.obj) : error LNK2001: unresolved external symbol __imp___std_init_once_complete mono\mini\mono-aot-cross.exe : fatal error LNK1120: 2 unresolved externals ninja: build stopped: subcommand failed. ``` context: https://github.com/dotnet/runtime/pull/67771#issuecomment-1099537001 --- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++------ 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 542052f984e5dd..7c966a2579ff67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,37 +174,37 @@ https://github.com/dotnet/runtime-assets 971b917c6c2061ea6a747f0345ac86882c02c466 - - https://github.com/dotnet/llvm-project - 3c3aebe3fff00bf4dd473e38d5295e10ab47726b - - - https://github.com/dotnet/llvm-project - 3c3aebe3fff00bf4dd473e38d5295e10ab47726b - - - https://github.com/dotnet/llvm-project - 3c3aebe3fff00bf4dd473e38d5295e10ab47726b - - - https://github.com/dotnet/llvm-project - 3c3aebe3fff00bf4dd473e38d5295e10ab47726b - - - https://github.com/dotnet/llvm-project - 3c3aebe3fff00bf4dd473e38d5295e10ab47726b - - - https://github.com/dotnet/llvm-project - 3c3aebe3fff00bf4dd473e38d5295e10ab47726b - - - https://github.com/dotnet/llvm-project - 3c3aebe3fff00bf4dd473e38d5295e10ab47726b - - - https://github.com/dotnet/llvm-project - 3c3aebe3fff00bf4dd473e38d5295e10ab47726b + + https://github.com/dotnet/llvm-project + d1be5205007e2546abeb7723799e51298880bf90 + + + https://github.com/dotnet/llvm-project + d1be5205007e2546abeb7723799e51298880bf90 + + + https://github.com/dotnet/llvm-project + d1be5205007e2546abeb7723799e51298880bf90 + + + https://github.com/dotnet/llvm-project + d1be5205007e2546abeb7723799e51298880bf90 + + + https://github.com/dotnet/llvm-project + d1be5205007e2546abeb7723799e51298880bf90 + + + https://github.com/dotnet/llvm-project + d1be5205007e2546abeb7723799e51298880bf90 + + + https://github.com/dotnet/llvm-project + d1be5205007e2546abeb7723799e51298880bf90 + + + https://github.com/dotnet/llvm-project + d1be5205007e2546abeb7723799e51298880bf90 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7136e6b9cb7487..6e19e19dacd6e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -184,14 +184,14 @@ 7.0.0-alpha.1.22173.2 - 11.1.0-alpha.1.22178.2 - 11.1.0-alpha.1.22178.2 - 11.1.0-alpha.1.22178.2 - 11.1.0-alpha.1.22178.2 - 11.1.0-alpha.1.22178.2 - 11.1.0-alpha.1.22178.2 - 11.1.0-alpha.1.22178.2 - 11.1.0-alpha.1.22178.2 + 11.1.0-alpha.1.22213.1 + 11.1.0-alpha.1.22213.1 + 11.1.0-alpha.1.22213.1 + 11.1.0-alpha.1.22213.1 + 11.1.0-alpha.1.22213.1 + 11.1.0-alpha.1.22213.1 + 11.1.0-alpha.1.22213.1 + 11.1.0-alpha.1.22213.1 7.0.0-preview.4.22201.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From fb9f01c8cd21358c861fd0e3865ce57ba74d3dab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Apr 2022 12:21:24 +0000 Subject: [PATCH 24/52] Update dependencies from https://github.com/dotnet/arcade build 20220414.3 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22214.3 --- eng/Version.Details.xml | 106 ++++++++++++++++++++-------------------- eng/Versions.props | 32 ++++++------ global.json | 6 +-- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c966a2579ff67..7b895003abbd51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a https://github.com/microsoft/vstest @@ -175,35 +175,35 @@ 971b917c6c2061ea6a747f0345ac86882c02c466 - https://github.com/dotnet/llvm-project + https://github.com/dotnet/llvm-project d1be5205007e2546abeb7723799e51298880bf90 - + - https://github.com/dotnet/llvm-project + https://github.com/dotnet/llvm-project d1be5205007e2546abeb7723799e51298880bf90 - + - https://github.com/dotnet/llvm-project + https://github.com/dotnet/llvm-project d1be5205007e2546abeb7723799e51298880bf90 - + - https://github.com/dotnet/llvm-project + https://github.com/dotnet/llvm-project d1be5205007e2546abeb7723799e51298880bf90 - + - https://github.com/dotnet/llvm-project + https://github.com/dotnet/llvm-project d1be5205007e2546abeb7723799e51298880bf90 - + - https://github.com/dotnet/llvm-project + https://github.com/dotnet/llvm-project d1be5205007e2546abeb7723799e51298880bf90 - + - https://github.com/dotnet/llvm-project + https://github.com/dotnet/llvm-project d1be5205007e2546abeb7723799e51298880bf90 - + - https://github.com/dotnet/llvm-project + https://github.com/dotnet/llvm-project d1be5205007e2546abeb7723799e51298880bf90 @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness f9a28aefa80424a69f3ce16e845c4e01e5d8c17e - + https://github.com/dotnet/arcade - 4ec0b54a25d4e2129e8b34f60b4489e325421cb7 + 5ef2983363df5e0d85181b2948e2a5b0c16aa41a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6e19e19dacd6e6..f626fcf277a077 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 2.5.1-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 - 7.0.0-beta.22213.2 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 2.5.1-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 + 7.0.0-beta.22214.3 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 3fc35c129757a4..77d72efc47bfb8 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22213.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22213.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22213.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22214.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22214.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22214.3", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.3.22171.1" From 7122405b5b5462bed4e61499c648037b5d583101 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 15 Apr 2022 18:47:41 -0500 Subject: [PATCH 25/52] bump xharness --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f626fcf277a077..495f7a9fbe1203 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ 1.1.0 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22206.1 - 1.0.0-prerelease.22206.1 - 1.0.0-prerelease.22206.1 + 1.0.0-prerelease.22214.2 + 1.0.0-prerelease.22214.2 + 1.0.0-prerelease.22214.2 1.1.0-alpha.0.22206.1 2.4.2-pre.22 0.12.0-pre.20 From d386b72ef72192692b21abed1aaedda10edd2e1f Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 15 Apr 2022 18:50:20 -0500 Subject: [PATCH 26/52] Bump llvm ObjWriter to an llvm with the vs 2022pre --- 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 7b895003abbd51..fc3bab1e049344 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,37 +16,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - f17917e8d6a2e3ba069cddeab873554706d502a5 + 05ec0c79e0cd9d4bb8a3764f70d0f49093c193d5 - + https://github.com/dotnet/llvm-project - f17917e8d6a2e3ba069cddeab873554706d502a5 + 05ec0c79e0cd9d4bb8a3764f70d0f49093c193d5 - + https://github.com/dotnet/llvm-project - f17917e8d6a2e3ba069cddeab873554706d502a5 + 05ec0c79e0cd9d4bb8a3764f70d0f49093c193d5 - + https://github.com/dotnet/llvm-project - f17917e8d6a2e3ba069cddeab873554706d502a5 + 05ec0c79e0cd9d4bb8a3764f70d0f49093c193d5 - + https://github.com/dotnet/llvm-project - f17917e8d6a2e3ba069cddeab873554706d502a5 + 05ec0c79e0cd9d4bb8a3764f70d0f49093c193d5 - + https://github.com/dotnet/llvm-project - f17917e8d6a2e3ba069cddeab873554706d502a5 + 05ec0c79e0cd9d4bb8a3764f70d0f49093c193d5 - + https://github.com/dotnet/llvm-project - f17917e8d6a2e3ba069cddeab873554706d502a5 + 05ec0c79e0cd9d4bb8a3764f70d0f49093c193d5 - + https://github.com/dotnet/llvm-project - f17917e8d6a2e3ba069cddeab873554706d502a5 + 05ec0c79e0cd9d4bb8a3764f70d0f49093c193d5 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 495f7a9fbe1203..c04a992b5be240 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,14 +78,14 @@ 3.1.0 7.0.0-preview.3.22171.1 - 1.0.0-alpha.1.22157.1 - 1.0.0-alpha.1.22157.1 - 1.0.0-alpha.1.22157.1 - 1.0.0-alpha.1.22157.1 - 1.0.0-alpha.1.22157.1 - 1.0.0-alpha.1.22157.1 - 1.0.0-alpha.1.22157.1 - 1.0.0-alpha.1.22157.1 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 6.0.0 1.1.1 From b80ec4562d17a9c16d787d44d9d416a833cfb72b Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Fri, 15 Apr 2022 18:31:25 -0700 Subject: [PATCH 27/52] Add back ObjWriter OSX.10.12 version prop --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index ca0ec617a9bc7a..90a3db3a5267b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,6 +85,7 @@ 1.0.0-alpha.1.22215.3 1.0.0-alpha.1.22215.3 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 6.0.0 1.1.1 From 46948bed7483de07ecb24033797dad722d057709 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 15 Apr 2022 19:35:47 -0500 Subject: [PATCH 28/52] Update mono llvm version to a build with VS2022.Pre --- 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 f6df6d10e2d8ba..ebe3806b3e377f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,37 +174,37 @@ https://github.com/dotnet/runtime-assets 78cb33dbb0fb5156f049b9e1778f47b508f1be9f - + https://github.com/dotnet/llvm-project - d1be5205007e2546abeb7723799e51298880bf90 + 6f32b19258abc17deb66dfc65bc7743206e6cd7d - + https://github.com/dotnet/llvm-project - d1be5205007e2546abeb7723799e51298880bf90 + 6f32b19258abc17deb66dfc65bc7743206e6cd7d - + https://github.com/dotnet/llvm-project - d1be5205007e2546abeb7723799e51298880bf90 + 6f32b19258abc17deb66dfc65bc7743206e6cd7d - + https://github.com/dotnet/llvm-project - d1be5205007e2546abeb7723799e51298880bf90 + 6f32b19258abc17deb66dfc65bc7743206e6cd7d - + https://github.com/dotnet/llvm-project - d1be5205007e2546abeb7723799e51298880bf90 + 6f32b19258abc17deb66dfc65bc7743206e6cd7d - + https://github.com/dotnet/llvm-project - d1be5205007e2546abeb7723799e51298880bf90 + 6f32b19258abc17deb66dfc65bc7743206e6cd7d - + https://github.com/dotnet/llvm-project - d1be5205007e2546abeb7723799e51298880bf90 + 6f32b19258abc17deb66dfc65bc7743206e6cd7d - + https://github.com/dotnet/llvm-project - d1be5205007e2546abeb7723799e51298880bf90 + 6f32b19258abc17deb66dfc65bc7743206e6cd7d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 90a3db3a5267b4..2d539aad311ce7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -184,14 +184,14 @@ 7.0.0-alpha.1.22181.2 - 11.1.0-alpha.1.22213.1 - 11.1.0-alpha.1.22213.1 - 11.1.0-alpha.1.22213.1 - 11.1.0-alpha.1.22213.1 - 11.1.0-alpha.1.22213.1 - 11.1.0-alpha.1.22213.1 - 11.1.0-alpha.1.22213.1 - 11.1.0-alpha.1.22213.1 + 11.1.0-alpha.1.22215.4 + 11.1.0-alpha.1.22215.4 + 11.1.0-alpha.1.22215.4 + 11.1.0-alpha.1.22215.4 + 11.1.0-alpha.1.22215.4 + 11.1.0-alpha.1.22215.4 + 11.1.0-alpha.1.22215.4 + 11.1.0-alpha.1.22215.4 7.0.0-preview.4.22212.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From 31eb413b4600845f694b5be91fd8f21ffe856f25 Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Sat, 16 Apr 2022 08:44:05 +0000 Subject: [PATCH 29/52] Bump VS2022 to mean v143 toolset - needed for IJW support of static abstract methods --- eng/native/init-vs-env.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/native/init-vs-env.cmd b/eng/native/init-vs-env.cmd index 7eefeea1271556..627a82ecec260f 100644 --- a/eng/native/init-vs-env.cmd +++ b/eng/native/init-vs-env.cmd @@ -52,7 +52,7 @@ if "%VisualStudioVersion%"=="16.0" ( ) if "%VisualStudioVersion%"=="17.0" ( set __VSVersion=vs2022 - set __PlatformToolset=v142 + set __PlatformToolset=v143 goto :SetVCEnvironment ) From fbf511f513c769360d36770ae91b3c2ad1792e70 Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Sat, 16 Apr 2022 08:58:21 +0000 Subject: [PATCH 30/52] Make VS2022 the only MSVC compiler on windows This is needed for the v143 toolset for IJW. Drop support for all prior versions. Co-authored-by: Andy Gocke --- eng/native/gen-buildsys.cmd | 2 -- eng/native/init-vs-env.cmd | 5 ----- eng/pipelines/libraries/stress/http.yml | 2 +- eng/pipelines/libraries/stress/ssl.yml | 2 +- eng/pipelines/official/jobs/prepare-signed-artifacts.yml | 2 +- eng/pipelines/official/stages/publish.yml | 2 +- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/eng/native/gen-buildsys.cmd b/eng/native/gen-buildsys.cmd index 243921d93d4ce5..3701e639cee983 100644 --- a/eng/native/gen-buildsys.cmd +++ b/eng/native/gen-buildsys.cmd @@ -29,8 +29,6 @@ if /i "%__Ninja%" == "1" ( ) else ( if /i NOT "%__Arch%" == "wasm" ( if /i "%__VSVersion%" == "vs2022" (set __CmakeGenerator=%__CmakeGenerator% 17 2022) - if /i "%__VSVersion%" == "vs2019" (set __CmakeGenerator=%__CmakeGenerator% 16 2019) - if /i "%__VSVersion%" == "vs2017" (set __CmakeGenerator=%__CmakeGenerator% 15 2017) if /i "%__Arch%" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64) if /i "%__Arch%" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A ARM) diff --git a/eng/native/init-vs-env.cmd b/eng/native/init-vs-env.cmd index 627a82ecec260f..9fa100950060f1 100644 --- a/eng/native/init-vs-env.cmd +++ b/eng/native/init-vs-env.cmd @@ -45,11 +45,6 @@ set "__VSCOMNTOOLS=" set "VSCMD_START_DIR=" :VSDetected -if "%VisualStudioVersion%"=="16.0" ( - set __VSVersion=vs2019 - set __PlatformToolset=v142 - goto :SetVCEnvironment -) if "%VisualStudioVersion%"=="17.0" ( set __VSVersion=vs2022 set __PlatformToolset=v143 diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 0d76b4e09ec8b0..e72006472bc051 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -97,7 +97,7 @@ jobs: DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share" pool: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre steps: - checkout: self diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index f3d294433af2dc..46c53c7240b84c 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -55,7 +55,7 @@ jobs: timeoutInMinutes: 120 pool: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre steps: - checkout: self diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index 8df497b7720e4e..0bed3269070ba7 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -10,7 +10,7 @@ jobs: dependsOn: ${{ parameters.dependsOn }} pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019 + demands: ImageOverride -equals build.windows.amd64.vs2022 # Double the default timeout. timeoutInMinutes: 180 workspace: diff --git a/eng/pipelines/official/stages/publish.yml b/eng/pipelines/official/stages/publish.yml index cba9958b2f76e7..8b11c5eac48637 100644 --- a/eng/pipelines/official/stages/publish.yml +++ b/eng/pipelines/official/stages/publish.yml @@ -20,7 +20,7 @@ stages: dependsOn: PrepareSignedArtifacts pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 # Stages-based publishing entry point - template: /eng/common/templates/post-build/post-build.yml From 8426dc3ea06900a29278c4ca8b7171e834e6c16b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Apr 2022 12:21:26 +0000 Subject: [PATCH 31/52] Update dependencies from https://github.com/dotnet/arcade build 20220415.1 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22215.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebe3806b3e377f..46f5ffcc8d5e0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - 5ef2983363df5e0d85181b2948e2a5b0c16aa41a + c49ad022e8d39db4bf47197aa4eebfe6428b51a7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2d539aad311ce7..3fe1133417ec24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 2.5.1-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 - 7.0.0-beta.22214.3 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 2.5.1-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 + 7.0.0-beta.22215.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 9d3dea49be549e..c6f32c4add397d 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22214.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22214.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22214.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22215.1", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.4.22208.8" From ba1778eb52f265c2d1ecc9965107998b3a26537e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Apr 2022 12:17:32 +0000 Subject: [PATCH 32/52] Update dependencies from https://github.com/dotnet/arcade build 20220415.2 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22215.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46f5ffcc8d5e0e..8c957110753204 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - c49ad022e8d39db4bf47197aa4eebfe6428b51a7 + 4000024394df3049886c50e54ad0a2b903221ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 3fe1133417ec24..1e2ebbd7b09685 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 2.5.1-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 - 7.0.0-beta.22215.1 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 2.5.1-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 + 7.0.0-beta.22215.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index c6f32c4add397d..9d69342da7cd9b 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22215.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22215.2", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.4.22208.8" From 362770a5fa101abf4a65f859e4dbb9c93e12c284 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Mon, 18 Apr 2022 15:53:53 -0700 Subject: [PATCH 33/52] Update IJW.cmake --- eng/native/ijw/IJW.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/native/ijw/IJW.cmake b/eng/native/ijw/IJW.cmake index 134fcd64123033..f606b5e98889fe 100644 --- a/eng/native/ijw/IJW.cmake +++ b/eng/native/ijw/IJW.cmake @@ -32,6 +32,7 @@ if (CLR_CMAKE_HOST_WIN32) endfunction() # 4365 - signed/unsigned mismatch + # 4679 - Could not import member. This is an issue with IJW and static abstract methods in interfaces. add_compile_options(/wd4365 /wd4679) # IJW From fe3c00b4be7e15844c7a43faa38ecf5168d1fc34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Apr 2022 12:22:36 +0000 Subject: [PATCH 34/52] Update dependencies from https://github.com/dotnet/arcade build 20220418.3 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22218.3 --- eng/Version.Details.xml | 76 ++++++++++++------------ eng/Versions.props | 32 +++++----- eng/common/templates/job/onelocbuild.yml | 2 +- global.json | 6 +- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c957110753204..91a04dd70dbf09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + 8425453874961a7d7d2379e3f39c104f9ad0a0bd https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 1e2ebbd7b09685..a32a49bb8e2c38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 2.5.1-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 - 7.0.0-beta.22215.2 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 2.5.1-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 + 7.0.0-beta.22218.3 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 9d1e3042d8a6c0..3bcd243c46b678 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -72,8 +72,8 @@ jobs: lclSource: ${{ parameters.LclSource }} lclPackageId: ${{ parameters.LclPackageId }} isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} ${{ if eq(parameters.CreatePr, true) }}: - isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} ${{ if eq(parameters.RepoType, 'gitHub') }}: isShouldReusePrSelected: ${{ parameters.ReusePr }} diff --git a/global.json b/global.json index 9d69342da7cd9b..5fbad9c2fe90ec 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22215.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22218.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22218.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22218.3", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.4.22208.8" From d19cc36998fdc2c80c084d87410e4bab544e3d40 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Wed, 20 Apr 2022 17:03:32 -0700 Subject: [PATCH 35/52] Try using the centos 8 package to see if Ruby version is the problem --- eng/pipelines/installer/jobs/base-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index eff31dd34eb6df..3e23c2007d0715 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -26,7 +26,7 @@ parameters: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg-20220408155542-cfdd435 packageType: deb packagingArgs: /p:BuildDebPackage=true - - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20220405201321-9b5bbc2 + - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-rpmpkg-20210714125410-daa5116 packageType: rpm packagingArgs: /p:BuildRpmPackage=true From 67b548a34f2e094cce13bed963c77ddb2c96e8c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Apr 2022 12:24:51 +0000 Subject: [PATCH 36/52] Update dependencies from https://github.com/dotnet/arcade build 20220420.6 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22220.6 --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 32 ++++---- .../templates/job/source-index-stage1.yml | 19 +++-- global.json | 6 +- 4 files changed, 69 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91a04dd70dbf09..b4cfa842fec1b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index a32a49bb8e2c38..fc7ab5c6acf45e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 2.5.1-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 - 7.0.0-beta.22218.3 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 2.5.1-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 + 7.0.0-beta.22220.6 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 4af724eb1a9ec9..c2d51098d35cb1 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -7,6 +7,7 @@ parameters: binlogPath: artifacts/log/Debug/Build.binlog condition: '' dependsOn: '' + pool: '' jobs: - job: SourceIndexStage1 @@ -22,13 +23,17 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 + steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} diff --git a/global.json b/global.json index 5fbad9c2fe90ec..d7f13b8ec8d015 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22218.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22218.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22218.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22220.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22220.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22220.6", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.4.22208.8" From 503a15de848abac1b53722be1dadacd2a1e570ab Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Fri, 22 Apr 2022 10:30:15 +0200 Subject: [PATCH 37/52] Revert temporary XHarness changes from #68024 --- Directory.Build.props | 3 --- src/libraries/sendtohelix-wasm.targets | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0a0c01f475494d..2e6a7b6c0f594e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -74,9 +74,6 @@ $(NetCoreAppToolCurrent) - - - net6.0 diff --git a/src/libraries/sendtohelix-wasm.targets b/src/libraries/sendtohelix-wasm.targets index aa2fe7f88c41b1..084783a4e0863e 100644 --- a/src/libraries/sendtohelix-wasm.targets +++ b/src/libraries/sendtohelix-wasm.targets @@ -99,19 +99,15 @@ true - - true + true false - - net6.0 true false - net6.0 From a11ad1786887998e30fc370b93e59847adccd91a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Apr 2022 12:23:49 +0000 Subject: [PATCH 38/52] Update dependencies from https://github.com/dotnet/arcade build 20220421.2 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22221.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd20ae2511249f..6fb73960f04164 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 https://github.com/microsoft/vstest @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - 8e2ccde11b70936d8254669a4a74653c580a1340 + daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6656680eef7852..e31b716338944e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 2.5.1-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 - 7.0.0-beta.22220.6 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 2.5.1-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 + 7.0.0-beta.22221.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index d7f13b8ec8d015..360ef8b6744ba1 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22220.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22220.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22220.6", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22221.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22221.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22221.2", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.4.22208.8" From e596ee606d935c20928288f022d94b623adfc5af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Apr 2022 12:20:32 +0000 Subject: [PATCH 39/52] Update dependencies from https://github.com/dotnet/arcade build 20220422.4 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22222.4 --- eng/Version.Details.xml | 76 ++++++++++++++++---------------- eng/Versions.props | 32 +++++++------- eng/common/cross/build-rootfs.sh | 17 ++++++- global.json | 6 +-- 4 files changed, 73 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fb73960f04164..c72435e77781a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 https://github.com/microsoft/vstest @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - daab9b4d3afbde7ed92882f0f0c540ef5e015fd2 + 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e31b716338944e..75319ee0456f66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 2.5.1-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 - 7.0.0-beta.22221.2 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 2.5.1-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 + 7.0.0-beta.22222.4 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index e784c9c005a2a1..5a59dcff28fb35 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -4,12 +4,13 @@ set -e usage() { - echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" + echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." echo " for FreeBSD can be: freebsd12, freebsd13" echo " for illumos can be: illumos." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" + echo "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." echo "--use-mirror - optional, use mirror URL to fetch resources, when available." exit 1 @@ -48,6 +49,7 @@ __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" +__AlpinePackages+=" compiler-rt-static" # CoreFX dependencies __UbuntuPackages+=" libcurl4-openssl-dev" @@ -164,6 +166,15 @@ while :; do no-lldb) unset __LLDB_Package ;; + llvm*) + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + parts=(${version//./ }) + __LLVM_MajorVersion="${parts[0]}" + __LLVM_MinorVersion="${parts[1]}" + if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then + __LLVM_MinorVersion=0; + fi + ;; xenial) # Ubuntu 16.04 if [ "$__CodeName" != "jessie" ]; then __CodeName=xenial @@ -261,6 +272,10 @@ if [ "$__BuildArch" == "armel" ]; then fi __UbuntuPackages+=" ${__LLDB_Package:-}" +if [ ! -z "$__LLVM_MajorVersion" ]; then + __UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev" +fi + if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then __RootfsDir=$ROOTFS_DIR fi diff --git a/global.json b/global.json index 360ef8b6744ba1..83aca3d2f54e1b 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22221.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22221.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22221.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22222.4", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22222.4", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.4.22208.8" From 844fd3db6a22176c24164ce51f660ce3616cec9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Apr 2022 12:21:07 +0000 Subject: [PATCH 40/52] Update dependencies from https://github.com/dotnet/arcade build 20220425.6 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22225.6 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 +-- global.json | 6 ++-- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ba9d6d9b3f50..8215f8f58585f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 https://github.com/microsoft/vstest @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 07be2fdffd4647..2c6ccb7a01e391 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 2.5.1-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 - 7.0.0-beta.22222.4 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 2.5.1-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 + 7.0.0-beta.22225.6 6.0.0-preview.1.102 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b1bca63ab1d82c..119a6c660d1a4d 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.10.0-preview2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.1.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f1e1cb53953bcc..797f05292a8515 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview - $defaultXCopyMSBuildVersion = '16.10.0-preview2' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview + $defaultXCopyMSBuildVersion = '17.1.0' if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } diff --git a/global.json b/global.json index 83aca3d2f54e1b..f2836b2a6eca3b 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22222.4", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22222.4", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22225.6", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.4.22208.8" From bc1cffa6312338dbc8ce794b9dbc15f961b59575 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Mon, 25 Apr 2022 22:16:18 -0700 Subject: [PATCH 41/52] Pass runtime identifier on command line to work around dotnet/sdk#25062 --- src/installer/tests/TestUtils/TestProjectFixture.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/installer/tests/TestUtils/TestProjectFixture.cs b/src/installer/tests/TestUtils/TestProjectFixture.cs index 54928abdf9a580..ce5a77d99fb593 100644 --- a/src/installer/tests/TestUtils/TestProjectFixture.cs +++ b/src/installer/tests/TestUtils/TestProjectFixture.cs @@ -298,6 +298,17 @@ public TestProjectFixture PublishProject( { publishArgs.Add("--self-contained"); publishArgs.Add(selfContained.Value ? "true" : "false"); + + // Workaround for https://github.com/dotnet/sdk/issues/25062 + // If self-contained is specified via the command line, also specify the + // runtime identifier (if we didn't already). Otherwise, the SDK ends up + // passing the runtime identifier of the SDK such that the one specified + // in the project file is ignored. + if (selfContained.Value && runtime == null) + { + publishArgs.Add("--runtime"); + publishArgs.Add(RepoDirProvider.TargetRID); + } } if (outputDirectory != null) From fcc2cd478eb0839156faaae25654481c1b27d836 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Mon, 2 May 2022 09:11:56 -0500 Subject: [PATCH 42/52] Add token to FF code --- .../wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs index c6caa8acc9c2de..fcc35ef4441b57 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs @@ -985,7 +985,7 @@ internal override async Task OnGetScriptSource(MessageId msg_id, string sc return false; using (var reader = new StreamReader(data)) - source = await reader.ReadToEndAsync(); + source = await reader.ReadToEndAsync(token); } await SendEvent(msg_id, "", JObject.FromObject(new { source, from = script_id }), token); } From 604a02348edab5d923ea1938e81ca1829cf8f14b Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Tue, 3 May 2022 01:29:19 -0700 Subject: [PATCH 43/52] Comment out WASM vsman - manual process --- src/workloads/workloads.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj index f64d641604674d..bc88c8f45dbb9b 100644 --- a/src/workloads/workloads.csproj +++ b/src/workloads/workloads.csproj @@ -137,9 +137,10 @@ - + + From 990c92e91f5c0ff8a59186c17e6cb770ba1d57dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 May 2022 12:19:47 +0000 Subject: [PATCH 44/52] Update dependencies from https://github.com/dotnet/linker build 20220503.2 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22252.2 -> To Version 7.0.100-1.22253.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 66523c30d0a9f0..92c7563e10fdb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime b8dc04b445fc98d24fd92262364a9e5b5e23a5b9 - + https://github.com/dotnet/linker - 05a3b652d525acaac1307221b62db979d0108692 + 2e91f8916748e794570fab82f7cf549ffde66aeb https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 15e6e55e3da60a..1368862e7347ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,7 +167,7 @@ 7.0.0-preview-20220429.1 - 7.0.100-1.22252.2 + 7.0.100-1.22253.2 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22214.2 From 4316f37166850fc676d1f272d0efc3071f37ad8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 May 2022 12:21:54 +0000 Subject: [PATCH 45/52] Update dependencies from https://github.com/dotnet/arcade build 20220504.2 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22254.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbbea50cae2bdb..079a59762562d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab https://github.com/microsoft/vstest @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - 5145e86df0c491e082b589aa31d69eea300adc02 + 9c9de91045b8691364e40426177da2e5c535d3ab https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 84cf3cf8109de9..a178a27b86c6e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 2.5.1-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 - 7.0.0-beta.22225.6 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 2.5.1-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 + 7.0.0-beta.22254.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 9c2ca7a7ff1654..f925b9adf320d7 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22225.6", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22254.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22254.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22254.2", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.5.22226.6" From ce7dce9bd2c5ca82f60f32e6016f60222ddadce7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 5 May 2022 17:17:20 +0200 Subject: [PATCH 46/52] Fix ApiCompat errors --- .../src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs index 3c33dd8bbf6301..72f3cc28a70be0 100644 --- a/src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs @@ -27,6 +27,7 @@ public static void InitializeArray(Array array, RuntimeFieldHandle fldHandle) } } + [Obsolete("OffsetToStringData has been deprecated. Use string.GetPinnableReference() instead.")] public static int OffsetToStringData { [Intrinsic] From 02e68be226afec9ed0a4a4e4a44e707f1e61dd27 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 5 May 2022 11:11:50 -0700 Subject: [PATCH 47/52] Comment out assert for now --- src/native/corehost/fxr/fx_ver.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/native/corehost/fxr/fx_ver.cpp b/src/native/corehost/fxr/fx_ver.cpp index c5ad4441d9a4fe..254f408effe9b8 100644 --- a/src/native/corehost/fxr/fx_ver.cpp +++ b/src/native/corehost/fxr/fx_ver.cpp @@ -386,6 +386,7 @@ bool parse_internal(const pal::string_t& ver, fx_ver_t* fx_ver, bool parse_only_ bool fx_ver_t::parse(const pal::string_t& ver, fx_ver_t* fx_ver, bool parse_only_production) { bool valid = parse_internal(ver, fx_ver, parse_only_production); - assert(!valid || fx_ver->as_str() == ver); + // Causes a SIGABRT in free() on MacOS at least in singlefile, possibly elsewhere + // assert(!valid || fx_ver->as_str() == ver); return valid; } From ccf828380ce82fe43d89f2b5a2af10d7d47d2e64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 May 2022 23:48:20 +0000 Subject: [PATCH 48/52] Update dependencies from https://github.com/dotnet/linker build 20220505.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22252.2 -> To Version 7.0.100-1.22255.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 92c7563e10fdb5..58ba5e4e167a7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime b8dc04b445fc98d24fd92262364a9e5b5e23a5b9 - + https://github.com/dotnet/linker - 2e91f8916748e794570fab82f7cf549ffde66aeb + 00e9a154efeb6369b1345bdafeebb686c0163841 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 1368862e7347ff..9f5716660aba5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,7 +167,7 @@ 7.0.0-preview-20220429.1 - 7.0.100-1.22253.2 + 7.0.100-1.22255.1 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22214.2 From 13e53a65509970c65273b281588000a458f74ab7 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Thu, 5 May 2022 17:01:10 -0600 Subject: [PATCH 49/52] Fix ProfileOptimization test --- .../System/Runtime/ProfileOptimization.cs | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Runtime/ProfileOptimization.cs b/src/libraries/System.Runtime.Extensions/tests/System/Runtime/ProfileOptimization.cs index 530661c9762ea2..64eb27b23a7f68 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/Runtime/ProfileOptimization.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/Runtime/ProfileOptimization.cs @@ -16,23 +16,37 @@ public class ProfileOptimizationTest : FileCleanupTestBase [ActiveIssue("https://github.com/dotnet/runtime/issues/31853", TestRuntimes.Mono)] public void ProfileOptimization_CheckFileExists(bool stopProfile) { - string profileFile = GetTestFileName(); + // Don't put this file into the normal per-test directory, because + // when RemoteExecutor.Invoke returns, it disposes this class and deletes + // that directory. Instead just put it in temp and delete it manually after. + string profileFile = Path.Combine(Path.GetTempPath(), GetTestFileName()); - RemoteExecutor.Invoke((_profileFile, _stopProfile) => + try { - // Perform the test work - ProfileOptimization.SetProfileRoot(Path.GetDirectoryName(_profileFile)); - ProfileOptimization.StartProfile(Path.GetFileName(_profileFile)); - - if (bool.Parse(_stopProfile)) + RemoteExecutor.Invoke((_profileFile, _stopProfile) => { - ProfileOptimization.StartProfile(null); - CheckProfileFileExists(_profileFile); - } + // Perform the test work + ProfileOptimization.SetProfileRoot(Path.GetDirectoryName(_profileFile)); + ProfileOptimization.StartProfile(Path.GetFileName(_profileFile)); - }, profileFile, stopProfile.ToString()).Dispose(); + if (bool.Parse(_stopProfile)) + { + ProfileOptimization.StartProfile(null); + CheckProfileFileExists(_profileFile); + } - CheckProfileFileExists(profileFile); + }, profileFile, stopProfile.ToString()).Dispose(); + + CheckProfileFileExists(profileFile); + } + finally + { + try + { + File.Delete(profileFile); + } + catch {} + } } static void CheckProfileFileExists(string profileFile) From b29d8c702910af2d0e953c3daaa7b9f3d5ce812d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 May 2022 20:25:04 +0000 Subject: [PATCH 50/52] Update dependencies from https://github.com/dotnet/linker build 20220506.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22255.1 -> To Version 7.0.100-1.22256.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 f0fa6b0a7ac664..01071530aa79e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime b8dc04b445fc98d24fd92262364a9e5b5e23a5b9 - + https://github.com/dotnet/linker - 00e9a154efeb6369b1345bdafeebb686c0163841 + eb6144b2406e2d7afe18afb6a152dcb71c23a724 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 23ac78671ab8ff..43d4698b838edf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 7.0.0-preview-20220429.1 - 7.0.100-1.22255.1 + 7.0.100-1.22256.1 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22214.2 From 60593e4e430663efc87c6ce89ed7d659c90a28d1 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 6 May 2022 16:20:47 -0500 Subject: [PATCH 51/52] Revert bad version reversions from 85d2aff4da96ac01babd461a1c76c358d4979d68 --- eng/Versions.props | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 43d4698b838edf..2ec18e00d57ed5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,14 +78,14 @@ 3.1.0 7.0.0-preview.5.22226.6 - 1.0.0-alpha.1.22204.1 - 1.0.0-alpha.1.22204.1 - 1.0.0-alpha.1.22204.1 - 1.0.0-alpha.1.22204.1 - 1.0.0-alpha.1.22204.1 - 1.0.0-alpha.1.22204.1 - 1.0.0-alpha.1.22204.1 - 1.0.0-alpha.1.22204.1 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 + 1.0.0-alpha.1.22215.3 6.0.0 1.1.1 From 9b73f24d519eeb8437551c98a497a9f701a8ff73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 May 2022 12:22:06 +0000 Subject: [PATCH 52/52] Update dependencies from https://github.com/dotnet/arcade build 20220505.2 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework , 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.22179.1 -> To Version 2.5.1-beta.22255.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01071530aa79e1..030a48c41ccfd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 https://github.com/microsoft/vstest @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 346d9406089d9f85bd1286b6b82dc723667b737a - + https://github.com/dotnet/arcade - 9c9de91045b8691364e40426177da2e5c535d3ab + ba1c3aff4be864c493031d989259ef92aaa23fc3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2ec18e00d57ed5..770e3ddc1c2388 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 2.5.1-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 - 7.0.0-beta.22254.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 2.5.1-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 + 7.0.0-beta.22255.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index f925b9adf320d7..d777e106b1f081 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100-preview.3.22179.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22254.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22254.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22254.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22255.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22255.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22255.2", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.5.22226.6"