From b6c55a0822a2d36f30af59f919facda0c26ae014 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 17:56:01 +0000 Subject: [PATCH 01/16] [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 8 -------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 139e6bcf1..9a84139e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -39,15 +35,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f97e57ec..6e3f696e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/source-build-reference-packages - 08e4967761f81c4c40b6872a0e639b4f588b4f00 + 9bac947956fd7af0340208d6bd1bf4ddeb915bdc From fb29ac89d88e84695eeba04433b14528033b6547 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 17:57:30 +0000 Subject: [PATCH 02/16] [internal/release/6.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/generate-sbom-prep.ps1 | 2 + eng/common/generate-sbom-prep.sh | 12 ++ eng/common/init-tools-native.ps1 | 142 ++++++++++++------ eng/common/internal/NuGet.config | 7 + eng/common/internal/Tools.csproj | 3 + eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/jobs/jobs.yml | 2 +- .../templates/post-build/post-build.yml | 8 +- eng/common/tools.ps1 | 4 + global.json | 4 +- 13 files changed, 141 insertions(+), 61 deletions(-) create mode 100644 eng/common/internal/NuGet.config diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e3f696e7..70095daea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index a1558013b..9be156679 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22314.7 + 6.0.0-beta.22411.3 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index a733a8885..3e5c1c74a 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -2,6 +2,8 @@ Param( [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed ) +. $PSScriptRoot\pipeline-logging-functions.ps1 + Write-Host "Creating dir $ManifestDirPath" # create directory for sbom manifest to be placed if (!(Test-Path -path $ManifestDirPath)) diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index f6c774531..d5c76dc82 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -2,6 +2,18 @@ source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +. $scriptroot/pipeline-logging-functions.sh + manifest_dir=$1 if [ ! -d "$manifest_dir" ] ; then diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index db830c00a..7428ef880 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,100 @@ 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 ($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 + $InstalledTools = @{} - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + if ($ToolVersion -eq "latest") { + $ToolVersion = "" + } + $ArcadeToolsDirectory = "C:\arcade-tools" + if (-not (Test-Path $ArcadeToolsDirectory)) { + Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." + exit 1 + } + $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 + } + $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" + if (-not (Test-Path -Path "$BinPathFile")) { + 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" + $ToolPath = Convert-Path -Path $BinPath + Write-Host "Adding $ToolName to the path ($ToolPath)..." + Write-Host "##vso[task.prependpath]$ToolPath" + $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } + } + } + return $InstalledTools + } 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 } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } + } 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 ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } + + 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 } - - 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 } } else { @@ -139,7 +191,7 @@ try { Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" return $InstallBin } - else { + elseif (-not ($PathPromotion)) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' exit 1 } @@ -149,4 +201,4 @@ catch { Write-Host $_.ScriptStackTrace Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_ ExitWithExitCode 1 -} +} \ No newline at end of file diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config new file mode 100644 index 000000000..19d3d311b --- /dev/null +++ b/eng/common/internal/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index beb9c4648..7f5ce6d60 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -8,6 +8,9 @@ + + + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 24cec0424..9ff6a10a6 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 9d1e3042d..991ae05f5 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -41,7 +41,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 variables: - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc..48918df74 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -90,7 +90,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 24e92a275..270607126 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -101,7 +101,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -138,7 +138,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -198,7 +198,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -255,7 +255,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f1e1cb539..81d7b0355 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,6 +635,10 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } + if ($env:NativeToolsOnMachine) { + Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." + $nativeArgs += @{ PathPromotion = $true } + } & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs } } diff --git a/global.json b/global.json index 80e9668ff..bb5632c68 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22314.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22411.3" } } From 82c049ca1dac1cce94e67ca7c13f5d7d0bb14807 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 23:00:41 +0000 Subject: [PATCH 03/16] [internal/release/6.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70095daea..ceda1d58e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9be156679..18787450d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22411.3 + 6.0.0-beta.22412.2 diff --git a/global.json b/global.json index bb5632c68..0aaa96317 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.106", + "dotnet": "6.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22411.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2" } } From 21b25c7f29760c251d828cc4e95c6a3cecb159c5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 23:05:20 +0000 Subject: [PATCH 04/16] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ceda1d58e..5699779c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d251862fe81655a95aea81683f44ef49f84d3cd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac + d12e2602ef0c533e47d9d4b21be1e3a64eab9cef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac + d12e2602ef0c533e47d9d4b21be1e3a64eab9cef diff --git a/eng/Versions.props b/eng/Versions.props index 18787450d..d0b920669 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22368.20 - 6.0.303-servicing.22368.20 + 6.0.304-servicing.22410.14 + 6.0.304-servicing.22410.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68459c79bc79a2bcc0a9e79c3aa11ee85900b919 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Aug 2022 14:24:50 +0000 Subject: [PATCH 05/16] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220813.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22412.1 -> To Version 6.0.0-servicing.22413.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5699779c4..5fddbc058 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - 9bac947956fd7af0340208d6bd1bf4ddeb915bdc + 7f458a0923e1984875989573ddbf44457ca97e72 From 82a4e957b6aac436ad901735e50ea6a590866a3a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 15 Aug 2022 07:18:43 +0000 Subject: [PATCH 06/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220814.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22410.14 -> To Version 6.0.304-servicing.22414.7 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.8 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 68 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a84139e5..58d531df9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -35,11 +39,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5699779c4..320ffa2a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 919562130283931bdcd05a684af1421d1e962aa3 + 30b3bb5110a42021492c8026f2dd6505636ef935 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + a3857767ed57ae348eb61fcbf64823db59f8b926 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf + 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d251862fe81655a95aea81683f44ef49f84d3cd7 + cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d251862fe81655a95aea81683f44ef49f84d3cd7 + cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d251862fe81655a95aea81683f44ef49f84d3cd7 + cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d12e2602ef0c533e47d9d4b21be1e3a64eab9cef + af2e3b813112dd163712697982a21e6587f0cd80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d12e2602ef0c533e47d9d4b21be1e3a64eab9cef + af2e3b813112dd163712697982a21e6587f0cd80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7a75fd34f53bc300206bd8cfc636527934dd17af + 40c4c0c7ea7ef93bf9876838aa895402464a69ea https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d0b920669..80303103e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.8-servicing.22368.4 + 6.0.9-servicing.22412.3 - 6.0.8-servicing.22368.7 + 6.0.9-servicing.22412.12 - 6.0.303 + 6.0.304 @@ -44,20 +44,20 @@ - 6.0.8 - 6.0.8 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 - 6.0.8-servicing.22363.16 + 6.0.9 + 6.0.9 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 + 6.0.9-servicing.22412.17 0.2.0 - 6.0.304-servicing.22410.14 - 6.0.304-servicing.22410.14 + 6.0.304-servicing.22414.7 + 6.0.304-servicing.22414.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.8-servicing.22363.6 - 6.0.8-servicing.22363.6 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22413.8 + 6.0.9-servicing.22413.8 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 2.1.0 - 6.0.8-servicing.22368.4 - 6.0.8-servicing.22368.4 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22413.1 + 6.0.9-servicing.22413.1 + 6.0.9 + 6.0.9 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.303 + 6.0.304 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From c6b29ab0fbd2a081b88c7e462c66e1dc59fc50c4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 00:11:52 +0000 Subject: [PATCH 07/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220816.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22414.7 -> To Version 6.0.304-servicing.22416.29 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 333fa587e..4cac88e4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af2e3b813112dd163712697982a21e6587f0cd80 + ebd953524b6b59eb59d6e0e64858e4559ddefef8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af2e3b813112dd163712697982a21e6587f0cd80 + ebd953524b6b59eb59d6e0e64858e4559ddefef8 diff --git a/eng/Versions.props b/eng/Versions.props index 80303103e..7dd2b498f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22414.7 - 6.0.304-servicing.22414.7 + 6.0.304-servicing.22416.29 + 6.0.304-servicing.22416.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 22f69f63493a4390fcc560c04d3c857b117fd64e Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:51:28 -0400 Subject: [PATCH 08/16] Update ManualVersions.props for upcoming Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ .../targets/GenerateBundledVersions.targets | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index efb09817f..7707ace1a 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.26 - 10.0.18362.26 - 10.0.19041.26 - 10.0.20348.26 - 10.0.22000.26 - 10.0.22621.26 + 10.0.17763.27 + 10.0.18362.27 + 10.0.19041.27 + 10.0.20348.27 + 10.0.22000.27 + 10.0.22621.27 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 840a2133b..342aa41ec 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -674,11 +674,18 @@ Copyright (c) .NET Foundation. All rights reserved. - - - - - + + + + + + + + + + + + From 1649241f1aa1a87b1be1be11c5081313444609cf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 01:18:07 +0000 Subject: [PATCH 09/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22416.29 -> To Version 6.0.304-servicing.22417.40 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cac88e4e..7d47da84f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cbd50f2422f987572071e04b2e26706671529b9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebd953524b6b59eb59d6e0e64858e4559ddefef8 + 578a3c18d071b8bddde630e34279370ec12a83f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebd953524b6b59eb59d6e0e64858e4559ddefef8 + 578a3c18d071b8bddde630e34279370ec12a83f6 diff --git a/eng/Versions.props b/eng/Versions.props index 7dd2b498f..d5d9ad28c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22416.29 - 6.0.304-servicing.22416.29 + 6.0.304-servicing.22417.40 + 6.0.304-servicing.22417.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7a8d9110c20480735e0f55c964063dd1e241836 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 05:11:07 +0000 Subject: [PATCH 10/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220817.44 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22416.29 -> To Version 6.0.304-servicing.22417.44 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 58d531df9..0e3004aca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -39,15 +39,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d47da84f..164f69335 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 30b3bb5110a42021492c8026f2dd6505636ef935 + 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ca2f1756cdf3a0f6224a0ce94614be877f765318 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 + d656a592f211bf88a47ed154ff6f22c65f35e468 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cbd50f2422f987572071e04b2e26706671529b9d + fcd819eba0ede8e4954e8c9e6307406f8afc4363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cbd50f2422f987572071e04b2e26706671529b9d + fcd819eba0ede8e4954e8c9e6307406f8afc4363 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cbd50f2422f987572071e04b2e26706671529b9d + fcd819eba0ede8e4954e8c9e6307406f8afc4363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578a3c18d071b8bddde630e34279370ec12a83f6 + 889e54d556b6cfafdf16155e7cbf056d2feeb58f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 578a3c18d071b8bddde630e34279370ec12a83f6 + 889e54d556b6cfafdf16155e7cbf056d2feeb58f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb + 5d275019237fbf9f4bf5d867f779c616ec264718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 40c4c0c7ea7ef93bf9876838aa895402464a69ea + c5b159a97f5af3c690d6515f35241c04c16b2b80 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d5d9ad28c..27a548c06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22412.3 + 6.0.9-servicing.22417.1 - 6.0.9-servicing.22412.12 + 6.0.9-servicing.22417.4 @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 - 6.0.9-servicing.22412.17 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 + 6.0.9-servicing.22417.6 0.2.0 - 6.0.304-servicing.22417.40 - 6.0.304-servicing.22417.40 + 6.0.304-servicing.22417.44 + 6.0.304-servicing.22417.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22413.8 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22416.9 + 6.0.9-servicing.22416.9 6.0.9 6.0.9 6.0.9 @@ -78,8 +78,8 @@ - 6.0.9-servicing.22413.1 - 6.0.9-servicing.22413.1 + 6.0.9-servicing.22417.4 + 6.0.9-servicing.22417.4 6.0.9 6.0.9 From 7f52fb2dad1e22d6a0a1232020ce0a91558972fb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 10:52:01 +0000 Subject: [PATCH 11/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220819.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22417.44 -> To Version 6.0.304-servicing.22419.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 164f69335..c406e7655 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating fcd819eba0ede8e4954e8c9e6307406f8afc4363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 889e54d556b6cfafdf16155e7cbf056d2feeb58f + 673ba84e4d1e6556ad86432de236f9ba0e74f4f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 889e54d556b6cfafdf16155e7cbf056d2feeb58f + 673ba84e4d1e6556ad86432de236f9ba0e74f4f7 diff --git a/eng/Versions.props b/eng/Versions.props index 27a548c06..242c77801 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22417.44 - 6.0.304-servicing.22417.44 + 6.0.304-servicing.22419.8 + 6.0.304-servicing.22419.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 52bfb672d55371b69fd296939d6e52dff1cb73e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 14:37:44 +0000 Subject: [PATCH 12/16] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220819.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22413.1 -> To Version 6.0.0-servicing.22419.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 164f69335..69ee7f799 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - 7f458a0923e1984875989573ddbf44457ca97e72 + e2fa1c80dd6776d8b1585f778f703812e3180cbe From 6ede5f9946f5ab201477f5535487deba56e6e4b8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 17 Aug 2022 00:28:54 +0000 Subject: [PATCH 13/16] Updated TestsToSkipPortableLinux.xml to add a similar test that failed for a similar reason. Likely related to ulimit --- test/SdkTests/TestsToSkipPortableLinux.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index d0ea16a8d..f9fe2c166 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -3,5 +3,9 @@ + + From 3863ed379595705ef9435cf2cc3aed9540b2fa4b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Aug 2022 19:59:37 +0000 Subject: [PATCH 14/16] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220819.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22419.1 -> To Version 6.0.0-servicing.22419.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 560f677e3..5d69647ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - e2fa1c80dd6776d8b1585f778f703812e3180cbe + fdbbfadcaa5804038ad0a3f67c33f489cbeda65c From e6e304d74f9c1ff52b888081238c0798e8408060 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 21 Aug 2022 16:03:49 +0000 Subject: [PATCH 15/16] Merged PR 25178: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22416.9 to 6.0.9-servicing.22419.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22416.9 to 6.0.9-servicing.22419.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22417.6 to 6.0.9-servicing.22419.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22417.6 to 6.0.9-servicing.22419.26 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22417.6 to 6.0.9-servicing.22419.26 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22417.6 to 6.0.9-servicing.22419.26 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.304 to 6.0.304 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.304-servicing.22417.12 to 6.0.304-servicing.22420.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.304 to 6.0.304 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22417.1 to 6.0.9-servicing.22419.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from ... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e3004aca..f54130e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -39,15 +39,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d69647ce..0a1fff994 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3bee59c73dcfd3a544b31c4ef51be53c1b08ea05 + f40e7ceff0e19c1383a2613030a5b78da8bcfed3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d656a592f211bf88a47ed154ff6f22c65f35e468 + 3fe12b935c03138f76364dc877a7e069e254b5b2 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fcd819eba0ede8e4954e8c9e6307406f8afc4363 + 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fcd819eba0ede8e4954e8c9e6307406f8afc4363 + 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fcd819eba0ede8e4954e8c9e6307406f8afc4363 + 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 673ba84e4d1e6556ad86432de236f9ba0e74f4f7 + bc6e6263c944d60b04685c6cc6389fd51a1773bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 673ba84e4d1e6556ad86432de236f9ba0e74f4f7 + bc6e6263c944d60b04685c6cc6389fd51a1773bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5d275019237fbf9f4bf5d867f779c616ec264718 + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c5b159a97f5af3c690d6515f35241c04c16b2b80 + a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 242c77801..edb0cba17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.9-servicing.22417.1 + 6.0.9-servicing.22419.10 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22420.4 @@ -46,18 +46,18 @@ 6.0.9 6.0.9 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 - 6.0.9-servicing.22417.6 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 + 6.0.9-servicing.22419.26 0.2.0 - 6.0.304-servicing.22419.8 - 6.0.304-servicing.22419.8 + 6.0.304-servicing.22420.10 + 6.0.304-servicing.22420.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.9-servicing.22416.9 - 6.0.9-servicing.22416.9 + 6.0.9-servicing.22419.5 + 6.0.9-servicing.22419.5 6.0.9 6.0.9 6.0.9 @@ -78,8 +78,8 @@ - 6.0.9-servicing.22417.4 - 6.0.9-servicing.22417.4 + 6.0.9-servicing.22420.3 + 6.0.9-servicing.22420.3 6.0.9 6.0.9 From d7151f758e12f3e7b8f4b9fe2b27e45decfc773b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Aug 2022 02:41:08 +0000 Subject: [PATCH 16/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220821.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.304-servicing.22420.10 -> To Version 6.0.304-servicing.22421.4 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.304 -> To Version 6.0.304 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f54130e9c..12bf3543c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a1fff994..34b38836f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad + 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad + 0b3a1bf29b9888fb2ae25df25be9f5231606c66f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1931b9eba8277c76b60fbde1f9d5d759b9d5b0ad + 0b3a1bf29b9888fb2ae25df25be9f5231606c66f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc6e6263c944d60b04685c6cc6389fd51a1773bb + 092f7d6f55df8dd0e5e88058aeb7f831679112d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bc6e6263c944d60b04685c6cc6389fd51a1773bb + 092f7d6f55df8dd0e5e88058aeb7f831679112d3 diff --git a/eng/Versions.props b/eng/Versions.props index edb0cba17..33a74cb2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.304-servicing.22420.10 - 6.0.304-servicing.22420.10 + 6.0.304-servicing.22421.4 + 6.0.304-servicing.22421.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)