From ea0ac0d0d4249f1325ec6a8f5b1e54eb1e1710d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Aug 2022 17:01:46 +0000 Subject: [PATCH 01/62] Update dependencies from https://github.com/dotnet/arcade build 20220811.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22314.7 -> To Version 6.0.0-beta.22411.3 --- NuGet.config | 8 - 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 +- 14 files changed, 141 insertions(+), 69 deletions(-) create mode 100644 eng/common/internal/NuGet.config diff --git a/NuGet.config b/NuGet.config index 8cac51c22..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fc7fed18..136c1e478 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 7efbe79d5..ae1cb3e14 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 b6c55a0822a2d36f30af59f919facda0c26ae014 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 17:56:01 +0000 Subject: [PATCH 02/62] [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 03/62] [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 04/62] [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 05/62] [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 06/62] 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 07/62] 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 40c798aee0d17e0fc1a04e3702e526b0c1751473 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 13:27:27 -0700 Subject: [PATCH 08/62] Update dependencies from https://github.com/dotnet/arcade build 20220812.2 (#14325) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22412.2 Co-authored-by: dotnet-maestro[bot] --- 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 136c1e478..21d61a26d 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 ae1cb3e14..dcf2435ae 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 c6b29ab0fbd2a081b88c7e462c66e1dc59fc50c4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Aug 2022 00:11:52 +0000 Subject: [PATCH 09/62] 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 10/62] 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 11/62] 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 12/62] 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 13/62] 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 14/62] 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 15/62] 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 16/62] 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 5589d6e61eb0ec706cf222e14b5f9d29e1117db9 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 19 Aug 2022 14:56:20 -0700 Subject: [PATCH 17/62] [release/6.0.1xx] Update Application Insights to 2.19.0, Update SBRP and SB externals (#14361) * Update sb externals, sbrp, and application insights * Update version numbers of sbrp and sb --- eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21d61a26d..3ebd698e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -156,9 +156,9 @@ 75551652b352f860ea0b29095b64fa63715dd672 - + https://github.com/Microsoft/ApplicationInsights-dotnet - 53b80940842204f78708a538628288ff5d741a1d + 93f745cfef8541f09862aae9bc8c04554bca38c7 @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk 52e9452f82e26f9fcae791e84c082ae22f1ef66f - + https://github.com/dotnet/source-build - 126aed9b11b5aece8ebcf7bdbb82d0654206d5a4 + 7649ca7106e7e91ac06f169626bf01a77c2258eb @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/source-build-reference-packages - bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b + fdbbfadcaa5804038ad0a3f67c33f489cbeda65c From e6e304d74f9c1ff52b888081238c0798e8408060 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 21 Aug 2022 16:03:49 +0000 Subject: [PATCH 18/62] 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 19/62] 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) From e3842453dc75760a7a0dd67c0f6be243a029ff0b Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Wed, 31 Aug 2022 17:17:42 -0700 Subject: [PATCH 20/62] Update public pool names --- .vsts-ci.yml | 10 +++++----- eng/common/templates/job/source-build.yml | 2 +- .../templates/job/source-build-create-tarball.yml | 2 +- .../templates/job/source-build-run-tarball-build.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6d7e6fb98..d2a36f01c 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -47,7 +47,7 @@ stages: - job: Publish_Build_Configuration pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -61,7 +61,7 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -118,7 +118,7 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -147,7 +147,7 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal @@ -333,7 +333,7 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5cd5325d7..88f6f75a6 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,7 +46,7 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public + name: NetCore-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 8e55a40b5..db3657cd9 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -6,7 +6,7 @@ jobs: displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index c8a0a71f1..d927cf7f0 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -25,7 +25,7 @@ parameters: poolInternalArm64: name: Docker-Linux-Arm-Internal poolPublicAmd64: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open jobs: From 1f6925cf9665936f389f9a413ad71d67ab3a7091 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Sep 2022 10:31:33 -0700 Subject: [PATCH 21/62] Update branding to 6.0.110 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dcf2435ae..ae00b05f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 09 + 10 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From f9c278be3320d598cb234af81d1df92dcff8fe21 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 13 Sep 2022 20:50:12 -0700 Subject: [PATCH 22/62] .NET Source-Build 6.0.109 September 2022 Updates (#14482) * update global.json and Versions.props for .NET SDK 6.0.109 * Use re-uploaded SB artifacts tarball version Co-authored-by: Logan Bussell --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ae00b05f3..1f2f79fe4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.108 + 6.0.109-2 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 3ba15beaa..063a6c676 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.108" + "dotnet": "6.0.109" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From ed6ae3ed1e290e2ed6f8041dcea507b2545af939 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 14 Sep 2022 10:00:10 -0700 Subject: [PATCH 23/62] [6.0.4] Update template versions from dotnet/aspnetcore (#14487) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ae2b861d3..275a86d09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.28 + 3.1.29 3.2.1 4.8.0-rc2.19462.10 From a5a36d4af56974c27d63f4baa784b568d9cb421f Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 14 Sep 2022 10:00:19 -0700 Subject: [PATCH 24/62] [6.0.3xx] Update template versions from dotnet/aspnetcore (#14486) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 319168073..642cee329 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.28 + 3.1.29 3.2.1 4.8.0-rc2.19462.10 From d42f27ecbe8381717d04606f6db02b4943fb0f73 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 14 Sep 2022 10:00:30 -0700 Subject: [PATCH 25/62] [6.0.1xx] Update template versions from dotnet/aspnetcore (#14485) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1f2f79fe4..a23d6a848 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.28 + 3.1.29 3.2.1 4.8.0-rc2.19462.10 From 5364e129c0437529cda530286ce1619c28d53a30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 14:36:17 -0700 Subject: [PATCH 26/62] Update dependencies from https://github.com/dotnet/arcade build 20220913.7 (#14499) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 11 ++++------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/post-build/post-build.yml | 8 ++++---- global.json | 6 +++--- 9 files changed, 23 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1cd04a927..71373bd88 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,18 @@ + + - - - - @@ -40,15 +38,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7e2e834b..2b8705345 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 275a86d09..eb64e689f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22412.2 + 6.0.0-beta.22463.7 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a6..aaeb83b4d 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 991ae05f5..5b1b77d1c 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -40,7 +40,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 variables: diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a6..b6137f44a 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 48918df74..9c4becbc8 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -89,7 +89,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 270607126..fc022ca9b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -100,7 +100,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -137,7 +137,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -197,7 +197,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -254,7 +254,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 0aaa96317..9d1e2d901 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.108", + "dotnet": "6.0.109", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7" } } From 44384ec703229b4851e2d051d62ae144d3cf09d7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Sep 2022 17:03:25 -0700 Subject: [PATCH 27/62] RTM Branding --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3f2dd5e62..7d9d733ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,8 +10,8 @@ 1 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rc - 2 + rtm + $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From a4940f87b3a75f566d98572b4dd0fd3105d22412 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 08:38:36 -0700 Subject: [PATCH 28/62] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14458) * Update dependencies from https://github.com/dotnet/sdk build 20220906.57 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22456.57 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 12.0.5-beta.22455.3 -> To Version 12.0.5-beta.22456.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220906.59 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22456.59 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22452.11 -> To Version 7.0.0-rc.2.22456.19 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220907.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22457.30 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220907.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22457.33 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220907.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22457.43 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Remove backported aspnetcore patch * Update dependencies from https://github.com/dotnet/sdk build 20220908.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22458.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220908.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22458.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220908.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22458.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220908.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22458.25 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220908.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22458.29 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220909.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22459.2 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220909.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22459.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220909.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22459.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Remove backported sdk patch * Update dependencies from https://github.com/dotnet/sdk build 20220909.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22459.22 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22457.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220909.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22459.26 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.2 (parent: Microsoft.NET.Sdk * Fix SDK patch * Resolve source-build patch conflict * Update dependencies from https://github.com/dotnet/sdk build 20220912.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22462.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220912.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22462.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.2 (parent: Microsoft.NET.Sdk * Fix hardcoded version in SDK to avoid package downgrade error * Update dependencies from https://github.com/dotnet/sdk build 20220912.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22462.17 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220912.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22462.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220912.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22462.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220912.39 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22462.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220912.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22462.44 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220913.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22463.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220913.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22463.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220913.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22463.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220913.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22463.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update source-build-externals needed for incoming sdk change * Update dependencies from https://github.com/dotnet/sdk build 20220913.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22463.37 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220913.46 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22463.46 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflicts * Update dependencies from https://github.com/dotnet/sdk build 20220913.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22463.56 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220913.66 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22463.66 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220914.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22464.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220914.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22464.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220914.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22464.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220914.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22464.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update net7.0 TFM patch for SDK * Update dependencies from https://github.com/dotnet/sdk build 20220914.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22464.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220914.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22464.35 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220914.42 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22464.42 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220914.61 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22464.61 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220915.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22465.1 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220915.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22465.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220915.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22456.13 -> To Version 7.0.100-rc.2.22465.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22431.6 -> To Version 7.0.0-rc.2.22459.5 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Larry Ewing --- eng/Version.Details.xml | 136 +++++++++--------- eng/Versions.props | 52 +++---- ...vert-sourcelink-submodule-workaround.patch | 48 ------- ...pdate-TFM-to-net7.0-for-source-build.patch | 129 ----------------- .../0002-Lift-System.Memory-version.patch | 2 +- ...Target-net7.0-in-additional-projects.patch | 65 --------- .../patches/sdk/0001-Disable-CA1420.patch | 11 +- ...002-Change-TargetFramework-to-net7.0.patch | 57 +++++--- 8 files changed, 140 insertions(+), 360 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-sourcelink-submodule-workaround.patch delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0003-Update-TFM-to-net7.0-for-source-build.patch delete mode 100644 src/SourceBuild/tarball/patches/runtime/0003-Target-net7.0-in-additional-projects.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 727a54e2c..92f1dbb02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - 9c70886ce692eb31afed39239ff5921abab65798 + 2be63be7944666ad0c9f7079db7d265b08d8af03 - + https://github.com/dotnet/windowsdesktop - 9c70886ce692eb31afed39239ff5921abab65798 + 2be63be7944666ad0c9f7079db7d265b08d8af03 - + https://github.com/dotnet/windowsdesktop - 9c70886ce692eb31afed39239ff5921abab65798 + 2be63be7944666ad0c9f7079db7d265b08d8af03 - + https://github.com/dotnet/windowsdesktop - 9c70886ce692eb31afed39239ff5921abab65798 + 2be63be7944666ad0c9f7079db7d265b08d8af03 - + https://github.com/dotnet/llvm-project - c1304304028d603e34f6803b0740c34441f80d2e + 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 https://github.com/dotnet/test-templates @@ -103,44 +103,44 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - a8e9c118bd0a2f797ac799cb293b091204694e34 + 391eef06e36b8d5636367d5e761e7a6293d49621 - + https://github.com/dotnet/sdk - a8e9c118bd0a2f797ac799cb293b091204694e34 + 391eef06e36b8d5636367d5e761e7a6293d49621 - + https://github.com/dotnet/sdk - a8e9c118bd0a2f797ac799cb293b091204694e34 + 391eef06e36b8d5636367d5e761e7a6293d49621 - + https://github.com/dotnet/sdk - a8e9c118bd0a2f797ac799cb293b091204694e34 + 391eef06e36b8d5636367d5e761e7a6293d49621 - + https://github.com/dotnet/winforms - 8eae0a9764548296263b8d7de19115cd7f9834c2 + a332a1fec8ddac6172ac149ff46c085cf2beeb43 - + https://github.com/dotnet/wpf - 0d7c37b9e225939c41da228ec38a229e5862532c + c9a6d9f821616f6f119088d50da6d0d0ce4891d5 - + https://github.com/dotnet/fsharp - 753fc58b631d7a5f7f0b085d4a3adb3b4d47c7e6 + 430d645d778ec0db10ad7ad0b02de9fab3ce5647 - + https://github.com/dotnet/fsharp - 753fc58b631d7a5f7f0b085d4a3adb3b4d47c7e6 + 430d645d778ec0db10ad7ad0b02de9fab3ce5647 - + https://github.com/microsoft/vstest - 713a8cdc0cebcbd0dbdff4bcd039ac2d51504452 + d94aafd04f9ebecda6d36cce3f8cc1605d88f4ed @@ -149,41 +149,41 @@ linker - + https://github.com/dotnet/roslyn - c5d3485aaab167b5b8d19ae8c317c7cf1693a08a + 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 2db11c256ade886f673ed56d12780fb70e6ef92e + 3d01db7c23495c327f010b6392961082839041a6 - + https://github.com/nuget/nuget.client - b396ad8b56c089ec3fa189f1013530d237a0e8c2 + d22c6743bf6237c39b98d5d680e06e6c33e97f1c https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 8d8d2122b16c81df4b158fe43995f958e8fe115e + 76e6b338e87093ddc9b3b650f027706aba65d388 - + https://github.com/dotnet/emsdk - 8d8d2122b16c81df4b158fe43995f958e8fe115e + 76e6b338e87093ddc9b3b650f027706aba65d388 https://github.com/dotnet/deployment-tools c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - e53b62ccc6a887987efdb820334594b674f6071d + 6e9ede1f2771f59d80a4050c02d051bbbd457c77 diff --git a/eng/Versions.props b/eng/Versions.props index 3f2dd5e62..515285694 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-rc.2.22431.4 + 7.0.0-rc.2.22431.7 - 7.0.0-rc.2.22431.4 + 7.0.0-rc.2.22431.6 @@ -49,46 +49,46 @@ - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 0.2.0 - 7.0.100-rc.2.22456.13 - 7.0.100-rc.2.22456.13 - 7.0.100-rc.2.22456.13 + 7.0.100-rc.2.22465.9 + 7.0.100-rc.2.22465.9 + 7.0.100-rc.2.22465.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22464.18 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 2.1.0 - 7.0.0-rc.2.22431.6 - 7.0.0-rc.2.22431.6 - 7.0.0-rc.2.22431.6 - 7.0.0-rc.2.22431.6 + 7.0.0-rc.2.22459.5 + 7.0.0-rc.2.22459.5 + 7.0.0-rc.2.22459.5 + 7.0.0-rc.2.22459.5 @@ -170,7 +170,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220905-03 + 17.4.0-preview-20220913-02 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.2.22430.5 - 7.0.0-rc.2.22430.5 + 7.0.0-rc.2.22459.3 + 7.0.0-rc.2.22459.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-sourcelink-submodule-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-sourcelink-submodule-workaround.patch deleted file mode 100644 index 1ab86bd3c..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-sourcelink-submodule-workaround.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9b529c2f911e9a7ad25586d0d4a8db8bc5a7b2e5 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Thu, 5 Aug 2021 22:44:48 +0000 -Subject: [PATCH] Revert sourcelink submodule workaround - -aspnetcore will fail the offline tarball build because of the sourcelink workaround being removed here. -To fix this, a sourcelink patch was added to address the issue. - -Backport: https://github.com/dotnet/source-build/issues/2708 ---- - eng/SourceBuild.props | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 3dbfe2ce7e..403b91f976 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -2,7 +2,6 @@ - - aspnetcore - true -- false - - - - - -- -- -- -- -- -- - -- 10 - true - Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools) - -diff --git a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj -index 26b5733684c3f..4df9075220402 100644 ---- a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj -+++ b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj -@@ -2,7 +2,7 @@ - - - Exe -- net6.0 -+ $(NetCoreAppToolCurrent) - latest - enable - diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch index f49d2ed95..c329100ec 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch @@ -12,9 +12,10 @@ diff --git a/Directory.Build.props b/Directory.Build.props index 1353696a29..4e7463a453 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -13,9 +13,11 @@ - net7.0 - $(SdkTargetFramework) +@@ -14,9 +14,11 @@ + + net6.0 - @@ -24,6 +25,6 @@ index 1353696a29..4e7463a453 100644 + CA1420 - Temporarily disable for source-build until SDK builds with latest toolset. + --> + $(NoWarn);NU1701;CA1420 + + true true - - diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch index bb3c2b80f..ae0617daa 100644 --- a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch +++ b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch @@ -4,6 +4,7 @@ Date: Fri, 22 Jul 2022 15:10:08 -0700 Subject: [PATCH] Change TargetFramework to net7.0 --- + Directory.Build.props | 2 ++ .../Microsoft.DotNet.ApiCompat.Task.csproj | 2 +- .../build/Microsoft.DotNet.ApiCompat.Task.targets | 2 +- .../Microsoft.DotNet.ApiCompat.Tool.csproj | 2 +- @@ -11,12 +12,26 @@ Subject: [PATCH] Change TargetFramework to net7.0 .../Microsoft.DotNet.PackageValidation.csproj | 2 +- .../Microsoft.Extensions.DotNetDeltaApplier.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - src/Layout/redist/targets/GenerateLayout.targets | 4 ++-- + src/Layout/redist/targets/GenerateLayout.targets | 2 +- src/Layout/redist/targets/OverlaySdkOnLKG.targets | 2 +- - 9 files changed, 10 insertions(+), 10 deletions(-) + .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 4 ++-- + 11 files changed, 13 insertions(+), 11 deletions(-) +diff --git a/Directory.Build.props b/Directory.Build.props +index 809b7c0668..10d7f2e1a2 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -17,6 +17,8 @@ + + net6.0 ++ ++ $(SdkTargetFramework) + + true diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj -index 2de17ce715..32e6580920 100644 +index 4d148d1360..8e2f52a7ac 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj @@ -1,7 +1,7 @@ -  + - net6.0 @@ -55,7 +70,7 @@ index 2de17ce715..32e6580920 100644 enable true diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj -index 7b8569a72b..b1e1e4d53e 100644 +index 4ee0173f24..c72ac850d1 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj @@ -1,7 +1,7 @@ @@ -94,12 +109,12 @@ index 40927ae1f2..3c2236e38d 100644 false diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 006f56939d..ddcfe2e362 100644 +index 03ea923734..3246138cf9 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -22,7 +22,7 @@ - + - $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll + $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll @@ -107,18 +122,9 @@ index 006f56939d..ddcfe2e362 100644 diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets -index 85adb4ed8a..d399fe6f29 100644 +index 148464df9e..d399fe6f29 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -161,7 +161,7 @@ - BeforeTargets="Build"> - - netcoreapp3.1 -- net6.0 -+ net7.0 - $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ - - @@ -196,7 +196,7 @@ @@ -141,3 +147,18 @@ index b31188d592..4052c1581b 100644 +diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +index fddcbefd6f..4a1830bd19 100644 +--- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj ++++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +@@ -1,8 +1,8 @@ +  + + +- net6.0;net472 +- net6.0 ++ $(ResolverTargetFramework);net472 ++ $(ResolverTargetFramework) + AnyCPU + win-x86;win-x64 + true From 7603b0278ceb0587008a96c704be85b7cc8eafdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Sep 2022 19:00:29 +0000 Subject: [PATCH 29/62] Update dependencies from https://github.com/dotnet/sdk build 20220915.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22465.9 -> To Version 7.0.100-rtm.22465.17 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 9 +++++---- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92f1dbb02..ea22a8c1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 391eef06e36b8d5636367d5e761e7a6293d49621 + e9e28df6aae8e67aa428a90975358a87a81e7b7b - + https://github.com/dotnet/sdk - 391eef06e36b8d5636367d5e761e7a6293d49621 + e9e28df6aae8e67aa428a90975358a87a81e7b7b - + https://github.com/dotnet/sdk - 391eef06e36b8d5636367d5e761e7a6293d49621 + e9e28df6aae8e67aa428a90975358a87a81e7b7b - + https://github.com/dotnet/sdk - 391eef06e36b8d5636367d5e761e7a6293d49621 + e9e28df6aae8e67aa428a90975358a87a81e7b7b diff --git a/eng/Versions.props b/eng/Versions.props index 7aa5850d6..849473343 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,8 @@ 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm - + + $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) @@ -62,9 +63,9 @@ - 7.0.100-rc.2.22465.9 - 7.0.100-rc.2.22465.9 - 7.0.100-rc.2.22465.9 + 7.0.100-rtm.22465.17 + 7.0.100-rtm.22465.17 + 7.0.100-rtm.22465.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd489dcdde7fb970404aa42a644e7ba09911fea1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Sep 2022 20:19:46 +0000 Subject: [PATCH 30/62] Update dependencies from https://github.com/dotnet/sdk build 20220915.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22465.9 -> To Version 7.0.100-rtm.22465.27 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 7.0.0-rc.2.22464.23 -> To Version 7.0.0-rc.2.22464.30 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea22a8c1b..1b986b44f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/aspnetcore - f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 + 430fd4679d6aea4dbee1df9d1233145ad22d1952 - + https://github.com/dotnet/aspnetcore - f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 + 430fd4679d6aea4dbee1df9d1233145ad22d1952 - + https://github.com/dotnet/aspnetcore - f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 + 430fd4679d6aea4dbee1df9d1233145ad22d1952 - + https://github.com/dotnet/aspnetcore - f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 + 430fd4679d6aea4dbee1df9d1233145ad22d1952 - + https://github.com/dotnet/aspnetcore - f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 + 430fd4679d6aea4dbee1df9d1233145ad22d1952 - + https://github.com/dotnet/aspnetcore - f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 + 430fd4679d6aea4dbee1df9d1233145ad22d1952 - + https://github.com/dotnet/aspnetcore - f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 + 430fd4679d6aea4dbee1df9d1233145ad22d1952 https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - e9e28df6aae8e67aa428a90975358a87a81e7b7b + 64a347c6e2269be5c9c93e7543c9f0769e30171b - + https://github.com/dotnet/sdk - e9e28df6aae8e67aa428a90975358a87a81e7b7b + 64a347c6e2269be5c9c93e7543c9f0769e30171b - + https://github.com/dotnet/sdk - e9e28df6aae8e67aa428a90975358a87a81e7b7b + 64a347c6e2269be5c9c93e7543c9f0769e30171b - + https://github.com/dotnet/sdk - e9e28df6aae8e67aa428a90975358a87a81e7b7b + 64a347c6e2269be5c9c93e7543c9f0769e30171b @@ -138,9 +138,9 @@ 430d645d778ec0db10ad7ad0b02de9fab3ce5647 - + https://github.com/microsoft/vstest - d94aafd04f9ebecda6d36cce3f8cc1605d88f4ed + 3c560f92eb7832d353f9cbeaa120b234e02ef027 @@ -154,14 +154,14 @@ 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 3d01db7c23495c327f010b6392961082839041a6 + 02b334e3afaa105221d0adb49a7b224407c5334c - + https://github.com/nuget/nuget.client - d22c6743bf6237c39b98d5d680e06e6c33e97f1c + fa9f471daebb817384840d162acc9a9592f88ce8 diff --git a/eng/Versions.props b/eng/Versions.props index 849473343..2c2f476c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 7.0.0-rc.2.22464.23 - 7.0.0-rc.2.22464.23 - 7.0.0-rc.2.22464.23 - 7.0.0-rc.2.22464.23 - 7.0.0-rc.2.22464.23 - 7.0.0-rc.2.22464.23 - 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.30 + 7.0.0-rc.2.22464.30 + 7.0.0-rc.2.22464.30 + 7.0.0-rc.2.22464.30 + 7.0.0-rc.2.22464.30 + 7.0.0-rc.2.22464.30 + 7.0.0-rc.2.22464.30 0.2.0 - 7.0.100-rtm.22465.17 - 7.0.100-rtm.22465.17 - 7.0.100-rtm.22465.17 + 7.0.100-rtm.22465.27 + 7.0.100-rtm.22465.27 + 7.0.100-rtm.22465.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220913-02 + 17.4.0-preview-20220915-01 From 3be4416d510a6137ab6f2b82eeb2671598d98ed7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Sep 2022 20:24:47 +0000 Subject: [PATCH 31/62] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220915.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22408.1 -> To Version 7.0.0-alpha.1.22465.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92f1dbb02..389e11cf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 - + https://github.com/dotnet/source-build-reference-packages - ddc5b4880b0bf18783fc6808c4d407214f7bdae1 + f1ca87cd81e6081e827f25150088fca734da8f5c diff --git a/eng/Versions.props b/eng/Versions.props index 7aa5850d6..f86edfcea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,8 @@ 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm - + + $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 3c64e3c9d42058e6f1fe97072a4acf76337ea866 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Sep 2022 22:59:10 +0000 Subject: [PATCH 32/62] Update dependencies from https://github.com/dotnet/sdk build 20220915.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22465.9 -> To Version 7.0.100-rtm.22465.35 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 7.0.0-rc.2.22459.5 -> To Version 7.0.0-rtm.22464.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 14 +++++++------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b986b44f..56dcbd332 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 2be63be7944666ad0c9f7079db7d265b08d8af03 + d13406fbc7a6429aec0e459402283ab760b2bdfe - + https://github.com/dotnet/windowsdesktop - 2be63be7944666ad0c9f7079db7d265b08d8af03 + d13406fbc7a6429aec0e459402283ab760b2bdfe - + https://github.com/dotnet/windowsdesktop - 2be63be7944666ad0c9f7079db7d265b08d8af03 + d13406fbc7a6429aec0e459402283ab760b2bdfe - + https://github.com/dotnet/windowsdesktop - 2be63be7944666ad0c9f7079db7d265b08d8af03 + d13406fbc7a6429aec0e459402283ab760b2bdfe https://github.com/dotnet/llvm-project @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 64a347c6e2269be5c9c93e7543c9f0769e30171b + 9083b31f089cada326a28ca96b10c19947887d4e - + https://github.com/dotnet/sdk - 64a347c6e2269be5c9c93e7543c9f0769e30171b + 9083b31f089cada326a28ca96b10c19947887d4e - + https://github.com/dotnet/sdk - 64a347c6e2269be5c9c93e7543c9f0769e30171b + 9083b31f089cada326a28ca96b10c19947887d4e - + https://github.com/dotnet/sdk - 64a347c6e2269be5c9c93e7543c9f0769e30171b + 9083b31f089cada326a28ca96b10c19947887d4e @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf c9a6d9f821616f6f119088d50da6d0d0ce4891d5 - + https://github.com/dotnet/fsharp - 430d645d778ec0db10ad7ad0b02de9fab3ce5647 + c706dcc522c65aae19d36c0901352e3ae3954f88 - + https://github.com/dotnet/fsharp - 430d645d778ec0db10ad7ad0b02de9fab3ce5647 + c706dcc522c65aae19d36c0901352e3ae3954f88 diff --git a/eng/Versions.props b/eng/Versions.props index 2c2f476c6..4b4d0c942 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22465.27 - 7.0.100-rtm.22465.27 - 7.0.100-rtm.22465.27 + 7.0.100-rtm.22465.35 + 7.0.100-rtm.22465.35 + 7.0.100-rtm.22465.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,10 +86,10 @@ - 7.0.0-rc.2.22459.5 - 7.0.0-rc.2.22459.5 - 7.0.0-rc.2.22459.5 - 7.0.0-rc.2.22459.5 + 7.0.0-rtm.22464.4 + 7.0.0-rtm.22464.4 + 7.0.0-rtm.22464.4 + 7.0.0-rtm.22464.4 From af5ebe34ef6963b713525333ced10cb2f9d4fce8 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 15 Sep 2022 16:31:45 -0700 Subject: [PATCH 33/62] [7.0.1xx] Revert roslyn CodeAnalysis patch removal (#14510) * Revert "Remove roslyn patch" This reverts commit fc74ae4df810086e14d4c0360f6e9a1cc6057ed9. * Revert "Remove unneeded ExtraPackageVersionPropsPackageInfo from Roslyn source-build project" This reverts commit 581e179517fa4cdc4e12cf8755833a61296ac0f7. --- .../tarball/content/repos/roslyn.proj | 4 +++ ...Microsoft.CodeAnalysis.Common-depend.patch | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 51efdd92e..29e53696f 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -32,6 +32,10 @@ need to support VS. --> + + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch new file mode 100644 index 000000000..6096888d1 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell <36081148+lbussell@users.noreply.github.com> +Date: Thu, 21 Oct 2021 23:15:23 +0000 +Subject: [PATCH 1/2] lift version of Microsoft.CodeAnalysis.Common + dependencies to previously source built versions + +Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch +--- + .../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +index 7eae8afa275..a50822a6aeb 100644 +--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj ++++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +@@ -27,5 +27,9 @@ + + + ++ ++ ++ ++ + + +\ No newline at end of file From 56e8cde75e26047aa2c952b72d9983590178102f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Sep 2022 01:34:17 +0000 Subject: [PATCH 34/62] Update dependencies from https://github.com/dotnet/sdk build 20220915.47 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.2.22465.9 -> To Version 7.0.100-rtm.22465.47 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 7.0.0-rc.2.22459.5 -> To Version 7.0.0-rtm.22464.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56dcbd332..f37cfb91c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 9083b31f089cada326a28ca96b10c19947887d4e + 9e3d39942e9ec3887d54fdc9fe2112f60357eddd - + https://github.com/dotnet/sdk - 9083b31f089cada326a28ca96b10c19947887d4e + 9e3d39942e9ec3887d54fdc9fe2112f60357eddd - + https://github.com/dotnet/sdk - 9083b31f089cada326a28ca96b10c19947887d4e + 9e3d39942e9ec3887d54fdc9fe2112f60357eddd - + https://github.com/dotnet/sdk - 9083b31f089cada326a28ca96b10c19947887d4e + 9e3d39942e9ec3887d54fdc9fe2112f60357eddd diff --git a/eng/Versions.props b/eng/Versions.props index 4b4d0c942..663688209 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22465.35 - 7.0.100-rtm.22465.35 - 7.0.100-rtm.22465.35 + 7.0.100-rtm.22465.47 + 7.0.100-rtm.22465.47 + 7.0.100-rtm.22465.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d5db09aecd7780220801302093c2844aecdf6ce9 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 15 Sep 2022 20:34:32 -0500 Subject: [PATCH 35/62] Add Roslyn patch to use source-built versions of ref packs and not use app host (#14518) * Add Roslyn patch to use source-built versions of ref packs and not use app host. * Update to new SBRP with ref packs. --- eng/Version.Details.xml | 4 +- ...uilt-version-of-ref-packs-and-don-t-.patch | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92f1dbb02..389e11cf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 - + https://github.com/dotnet/source-build-reference-packages - ddc5b4880b0bf18783fc6808c4d407214f7bdae1 + f1ca87cd81e6081e827f25150088fca734da8f5c diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch new file mode 100644 index 000000000..d1b29223a --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 15 Sep 2022 14:46:53 -0500 +Subject: [PATCH] Use the source-built version of ref packs and don't use app + host when building in source-build. + +Backport PR: https://github.com/dotnet/roslyn/pull/64055. + +--- + Directory.Build.targets | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/Directory.Build.targets b/Directory.Build.targets +index 8f38a48cd95..dfb4fd33c9a 100644 +--- a/Directory.Build.targets ++++ b/Directory.Build.targets +@@ -1,5 +1,20 @@ + + ++ ++ ++ ++ 6.0.0 ++ ++ ++ 6.0.0 ++ ++ ++ ++ ++ ++ false ++ ++ + + + From 87df2fdd1c7ae42a6bcdfc508a451c98be627766 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Sep 2022 03:27:39 +0000 Subject: [PATCH 36/62] Update dependencies from https://github.com/dotnet/sdk build 20220915.53 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.47 -> To Version 7.0.100-rtm.22465.53 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22464.18 -> To Version 7.0.0-rtm.22465.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f5802709..f14e40408 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 + ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/dotnet/runtime - 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 + ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/dotnet/runtime - 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 + ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/dotnet/runtime - 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 + ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/dotnet/runtime - 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 + ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/dotnet/runtime - 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 + ee6cde5defb8d697d4a28602d072a3784890728f @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 + ee6cde5defb8d697d4a28602d072a3784890728f https://github.com/dotnet/aspnetcore @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 9e3d39942e9ec3887d54fdc9fe2112f60357eddd + d62a5efb97185abae389dfbc5f1d6fdab5f5da64 - + https://github.com/dotnet/sdk - 9e3d39942e9ec3887d54fdc9fe2112f60357eddd + d62a5efb97185abae389dfbc5f1d6fdab5f5da64 - + https://github.com/dotnet/sdk - 9e3d39942e9ec3887d54fdc9fe2112f60357eddd + d62a5efb97185abae389dfbc5f1d6fdab5f5da64 - + https://github.com/dotnet/sdk - 9e3d39942e9ec3887d54fdc9fe2112f60357eddd + d62a5efb97185abae389dfbc5f1d6fdab5f5da64 @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf c9a6d9f821616f6f119088d50da6d0d0ce4891d5 - + https://github.com/dotnet/fsharp - c706dcc522c65aae19d36c0901352e3ae3954f88 + 1f56aa9c36d2919ba52c5b4f5abd449161e7ca01 - + https://github.com/dotnet/fsharp - c706dcc522c65aae19d36c0901352e3ae3954f88 + 1f56aa9c36d2919ba52c5b4f5abd449161e7ca01 diff --git a/eng/Versions.props b/eng/Versions.props index 663688209..d5e0e5a31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,25 +63,25 @@ - 7.0.100-rtm.22465.47 - 7.0.100-rtm.22465.47 - 7.0.100-rtm.22465.47 + 7.0.100-rtm.22465.53 + 7.0.100-rtm.22465.53 + 7.0.100-rtm.22465.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.2.22464.18 + 7.0.0-rtm.22465.3 - 7.0.0-rc.2.22464.18 - 7.0.0-rc.2.22464.18 - 7.0.0-rc.2.22464.18 - 7.0.0-rc.2.22464.18 - 7.0.0-rc.2.22464.18 - 7.0.0-rc.2.22464.18 + 7.0.0-rtm.22465.3 + 7.0.0-rtm.22465.3 + 7.0.0-rtm.22465.3 + 7.0.0-rtm.22465.3 + 7.0.0-rtm.22465.3 + 7.0.0-rtm.22465.3 2.1.0 From 2c4d27f6a9d9961b89cccc06d1251e1c78f00717 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Sep 2022 04:45:51 +0000 Subject: [PATCH 37/62] Update dependencies from https://github.com/dotnet/sdk build 20220915.59 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.47 -> To Version 7.0.100-rtm.22465.59 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.2.22464.18 -> To Version 7.0.0-rtm.22465.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f14e40408..40dc2f0f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/dotnet/aspnetcore - 430fd4679d6aea4dbee1df9d1233145ad22d1952 + ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 - + https://github.com/dotnet/aspnetcore - 430fd4679d6aea4dbee1df9d1233145ad22d1952 + ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 - + https://github.com/dotnet/aspnetcore - 430fd4679d6aea4dbee1df9d1233145ad22d1952 + ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 - + https://github.com/dotnet/aspnetcore - 430fd4679d6aea4dbee1df9d1233145ad22d1952 + ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 - + https://github.com/dotnet/aspnetcore - 430fd4679d6aea4dbee1df9d1233145ad22d1952 + ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 - + https://github.com/dotnet/aspnetcore - 430fd4679d6aea4dbee1df9d1233145ad22d1952 + ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 - + https://github.com/dotnet/aspnetcore - 430fd4679d6aea4dbee1df9d1233145ad22d1952 + ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - d62a5efb97185abae389dfbc5f1d6fdab5f5da64 + c0681d063828c64e9dca9b714fade8588a672ba9 - + https://github.com/dotnet/sdk - d62a5efb97185abae389dfbc5f1d6fdab5f5da64 + c0681d063828c64e9dca9b714fade8588a672ba9 - + https://github.com/dotnet/sdk - d62a5efb97185abae389dfbc5f1d6fdab5f5da64 + c0681d063828c64e9dca9b714fade8588a672ba9 - + https://github.com/dotnet/sdk - d62a5efb97185abae389dfbc5f1d6fdab5f5da64 + c0681d063828c64e9dca9b714fade8588a672ba9 diff --git a/eng/Versions.props b/eng/Versions.props index d5e0e5a31..12e01a759 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 7.0.0-rc.2.22464.30 - 7.0.0-rc.2.22464.30 - 7.0.0-rc.2.22464.30 - 7.0.0-rc.2.22464.30 - 7.0.0-rc.2.22464.30 - 7.0.0-rc.2.22464.30 - 7.0.0-rc.2.22464.30 + 7.0.0-rc.2.22465.10 + 7.0.0-rc.2.22465.10 + 7.0.0-rc.2.22465.10 + 7.0.0-rc.2.22465.10 + 7.0.0-rc.2.22465.10 + 7.0.0-rc.2.22465.10 + 7.0.0-rc.2.22465.10 0.2.0 - 7.0.100-rtm.22465.53 - 7.0.100-rtm.22465.53 - 7.0.100-rtm.22465.53 + 7.0.100-rtm.22465.59 + 7.0.100-rtm.22465.59 + 7.0.100-rtm.22465.59 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 154fdfe341ec75df0549dc4b88956b76fecd88dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Sep 2022 06:53:33 +0000 Subject: [PATCH 38/62] Update dependencies from https://github.com/dotnet/sdk build 20220915.64 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.59 -> To Version 7.0.100-rtm.22465.64 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build From Version 7.0.0-rc.2.22465.10 -> To Version 7.0.0-rc.2.22465.19 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40dc2f0f5..a97f70e34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/dotnet/aspnetcore - ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 + 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f - + https://github.com/dotnet/aspnetcore - ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 + 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f - + https://github.com/dotnet/aspnetcore - ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 + 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f - + https://github.com/dotnet/aspnetcore - ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 + 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f - + https://github.com/dotnet/aspnetcore - ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 + 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f - + https://github.com/dotnet/aspnetcore - ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 + 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f - + https://github.com/dotnet/aspnetcore - ddfbb0795d60dd60573d0fa61eeea8cf2b4a6e41 + 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - c0681d063828c64e9dca9b714fade8588a672ba9 + 946938fab4bc986b5cfb0490e0adf22b93d388ef - + https://github.com/dotnet/sdk - c0681d063828c64e9dca9b714fade8588a672ba9 + 946938fab4bc986b5cfb0490e0adf22b93d388ef - + https://github.com/dotnet/sdk - c0681d063828c64e9dca9b714fade8588a672ba9 + 946938fab4bc986b5cfb0490e0adf22b93d388ef - + https://github.com/dotnet/sdk - c0681d063828c64e9dca9b714fade8588a672ba9 + 946938fab4bc986b5cfb0490e0adf22b93d388ef @@ -154,9 +154,9 @@ 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 02b334e3afaa105221d0adb49a7b224407c5334c + 6033e4c95bcd9fa31ebe9b52462c15521cda8f62 diff --git a/eng/Versions.props b/eng/Versions.props index 12e01a759..8f69d9cb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 7.0.0-rc.2.22465.10 - 7.0.0-rc.2.22465.10 - 7.0.0-rc.2.22465.10 - 7.0.0-rc.2.22465.10 - 7.0.0-rc.2.22465.10 - 7.0.0-rc.2.22465.10 - 7.0.0-rc.2.22465.10 + 7.0.0-rc.2.22465.19 + 7.0.0-rc.2.22465.19 + 7.0.0-rc.2.22465.19 + 7.0.0-rc.2.22465.19 + 7.0.0-rc.2.22465.19 + 7.0.0-rc.2.22465.19 + 7.0.0-rc.2.22465.19 0.2.0 - 7.0.100-rtm.22465.59 - 7.0.100-rtm.22465.59 - 7.0.100-rtm.22465.59 + 7.0.100-rtm.22465.64 + 7.0.100-rtm.22465.64 + 7.0.100-rtm.22465.64 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd00a7df5b0c5a5c52ae7f1a30bc6e04da78d5bb Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 16 Sep 2022 15:35:07 +0000 Subject: [PATCH 39/62] Remove PrivateSourceBuiltPrebuiltsPackageVersion since all prebuilts have been removed --- eng/Versions.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8f69d9cb0..87b644061 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -194,7 +194,6 @@ necessary, and this property is removed from the file. --> 7.0.100-rc.1 - 0.1.0-7.0.100-9 From ed261f1c1ae9a9619cdb72b1c0734d7a43df6f9a Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 16 Sep 2022 13:35:20 -0500 Subject: [PATCH 40/62] Add RID argument to llvm-project repo.proj. (#14534) --- src/SourceBuild/tarball/content/repos/llvm-project.proj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/repos/llvm-project.proj b/src/SourceBuild/tarball/content/repos/llvm-project.proj index c2c23cba4..addb0457c 100644 --- a/src/SourceBuild/tarball/content/repos/llvm-project.proj +++ b/src/SourceBuild/tarball/content/repos/llvm-project.proj @@ -2,7 +2,10 @@ - $(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) + + + $(BuildCommandArgs) /p:OutputRid=$(PortableRid) + $(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) $(BuildCommandArgs) $(ProjectDirectory)global.json $(ProjectDirectory)NuGet.config From 3c6ec269a277faecdebcf24c4a2fe9f434484a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Sep 2022 19:41:56 +0000 Subject: [PATCH 41/62] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220916.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22465.1 -> To Version 7.0.0-alpha.1.22466.3 --- 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 a97f70e34..5a6510700 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 - + https://github.com/dotnet/source-build-reference-packages - f1ca87cd81e6081e827f25150088fca734da8f5c + 6d1119ce3caac7e29f7e44c6be80494345f9de2a From 10cbea2a9729eee9d7163b2cba7ae8a3819da5c9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 16 Sep 2022 14:56:33 -0700 Subject: [PATCH 42/62] Update the minimum version in the installer UI to 17.4 (which is recommended) --- .../targets/packaging/windows/clisdk/LCID/1028/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1029/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1031/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1033/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1036/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1040/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1041/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1042/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1045/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1046/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1049/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1055/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/2052/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/3082/bundle.wxl | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index ca02da5af..560a196e9 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -76,7 +76,7 @@ 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要搭配 Visual Studio 使用 .NET 7.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet7-release-notes">深入了解</A>. + 若預計要搭配 Visual Studio 使用 .NET 7.0，需要 Visual Studio 2022 17.4 或更新版本。<A HREF="https://aka.ms/dotnet7-release-notes">深入了解</A>. 按一下 [\[]安裝[\[] 即表示您同意下列條款。 The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 1ec8c8b05..3b40ee4f3 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -76,7 +76,7 @@ Zdroje informací Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud se chystáte používat .NET 7.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet7-release-notes">Další informace</A>. + Pokud se chystáte používat .NET 7.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.4 nebo novější. <A HREF="https://aka.ms/dotnet7-release-notes">Další informace</A>. Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index dc507f81a..8e7bc63c3 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -76,7 +76,7 @@ Ressourcen Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie .NET 7.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet7-release-notes">Weitere Informationen</A> + Wenn Sie .NET 7.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.4 oder höher erforderlich. <A HREF="https://aka.ms/dotnet7-release-notes">Weitere Informationen</A> Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl index 1555badfa..5caf9204f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -76,7 +76,7 @@ Resources Installation note A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete. - If you plan to use .NET 7.0 with Visual Studio, Visual Studio 2022 17.0 or newer is required. <A HREF="https://aka.ms/dotnet7-release-notes">Learn more</A>. + If you plan to use .NET 7.0 with Visual Studio, Visual Studio 2022 17.4 or newer is required. <A HREF="https://aka.ms/dotnet7-release-notes">Learn more</A>. By clicking Install, you agree to the following terms: The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index f3575e82e..c536c3eb3 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -76,7 +76,7 @@ Ressources Note d'installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous comptez utiliser .NET 7.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet7-release-notes">En savoir plus</A>. + Si vous comptez utiliser .NET 7.0 avec Visual Studio, Visual Studio 2022 17.4 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet7-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index c272287db..5633413e5 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -76,7 +76,7 @@ Risorse Nota sull'installazione Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto. - Se si intende usare .NET 7.0 con Visual Studio, è richiesto Visual Studio 2022 17.0 o versione successiva. <A HREF="https://aka.ms/dotnet7-release-notes">Altre informazioni</A>. + Se si intende usare .NET 7.0 con Visual Studio, è richiesto Visual Studio 2022 17.4 o versione successiva. <A HREF="https://aka.ms/dotnet7-release-notes">Altre informazioni</A>. Facendo clic su Installa, si accettano le condizioni seguenti. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 1ff1e1cd5..6d1134ef2 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -76,7 +76,7 @@ インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .NET 7.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet7-release-notes">詳細情報</A>。 + .NET 7.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.4 以降が必要です。<A HREF="https://aka.ms/dotnet7-release-notes">詳細情報</A>。 [インストール] をクリックすると、次の条項に同意したものと見なされます。 The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index 63aaad0ae..c086313c9 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -76,7 +76,7 @@ 설치 정보 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. - Visual Studio와 함께 .NET 7.0을 사용하려면 Visual Studio 2022 17.0 이상이 필요합니다. <A HREF="https://aka.ms/dotnet7-release-notes">자세한 정보</A>. + Visual Studio와 함께 .NET 7.0을 사용하려면 Visual Studio 2022 17.4 이상이 필요합니다. <A HREF="https://aka.ms/dotnet7-release-notes">자세한 정보</A>. [설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index 2a2c5898f..7139a7f10 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -76,7 +76,7 @@ Zasoby Uwaga dotycząca instalacji W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę. - Jeśli planujesz używać platformy .NET 7.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.0 lub nowszy. <A HREF="https://aka.ms/dotnet7-release-notes">Dowiedz się więcej</A>. + Jeśli planujesz używać platformy .NET 7.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.4 lub nowszy. <A HREF="https://aka.ms/dotnet7-release-notes">Dowiedz się więcej</A>. Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index a2f155970..807e819b7 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -76,7 +76,7 @@ Recursos Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - Se você planeja usar o .NET 7.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet7-release-notes">Saiba mais</A>. + Se você planeja usar o .NET 7.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.4 ou mais recente. <A HREF="https://aka.ms/dotnet7-release-notes">Saiba mais</A>. Ao clicar em instalar, você concorda com os termos a seguir. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index 47617fb91..789d01b60 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -76,7 +76,7 @@ Примечание по установке В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. - Если вы планируете использовать .NET 7.0 с Visual Studio, требуется Visual Studio 2022 версии 17.0 или более поздней. <A HREF="https://aka.ms/dotnet7-release-notes">Дополнительные сведения</A>. + Если вы планируете использовать .NET 7.0 с Visual Studio, требуется Visual Studio 2022 версии 17.4 или более поздней. <A HREF="https://aka.ms/dotnet7-release-notes">Дополнительные сведения</A>. Нажимая кнопку "Установить", вы принимаете следующие условия. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index ab5740a20..93d628b74 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -76,7 +76,7 @@ Kaynaklar Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET 7.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet7-release-notes">Daha Fazla Bilgi</A>. + Visual Studio ile .NET 7.0 kullanmayı planlıyorsanız Visual Studio 2022 17.4 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet7-release-notes">Daha Fazla Bilgi</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index e8332ce17..a0e8980fd 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -76,7 +76,7 @@ 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果打算结合使用 .NET 7.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet7-release-notes">了解详细信息</A>。 + 如果打算结合使用 .NET 7.0 和 Visual Studio，需要 Visual Studio 2022 17.4 或更高版本。<A HREF="https://aka.ms/dotnet7-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款。 The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index 06b1e3fd7..67487f10d 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -76,7 +76,7 @@ Recursos Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si tiene previsto usar .NET 7.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet7-release-notes">Obtenga más información</A>. + Si tiene previsto usar .NET 7.0 con Visual Studio, se requiere Visual Studio 2022 17.4 o una versión más reciente. <A HREF="https://aka.ms/dotnet7-release-notes">Obtenga más información</A>. Al hacer clic en Instalar, acepta los términos siguientes. The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" From b524486b585145dc53446631c994768e4463adaa Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 16 Sep 2022 14:58:57 -0700 Subject: [PATCH 43/62] I noticed the osx release notes link was off as well. --- .../packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- .../packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- .../osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- .../osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -25,7 +25,7 @@ diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index 7159a3518..dcfc539c7 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -25,7 +25,7 @@ From dcf5274781a1dc3e0260a5e80d6b9800d13a6a94 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Sep 2022 17:08:29 -0500 Subject: [PATCH 44/62] Fix spelling error in msbuild property reference (#14531) --- eng/Version.Details.xml | 4 ++-- ...Use-the-source-built-version-of-ref-packs-and-don-t-.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a97f70e34..5a6510700 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 - + https://github.com/dotnet/source-build-reference-packages - f1ca87cd81e6081e827f25150088fca734da8f5c + 6d1119ce3caac7e29f7e44c6be80494345f9de2a diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch index d1b29223a..1a9573cb5 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch @@ -18,7 +18,7 @@ index 8f38a48cd95..dfb4fd33c9a 100644 + -+ ++ + + 6.0.0 + From a0f85d5b8a89280505feb8b97fc85b7b6d0ec55f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Sep 2022 18:03:35 +0000 Subject: [PATCH 45/62] Update dependencies from https://github.com/dotnet/arcade build 20220914.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.22462.6 -> To Version 7.0.0-beta.22464.4 --- 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 5a6510700..230e3aa75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 + 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/arcade - a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 + 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/arcade - a8b74560cd0ad9a01f0356369bb9dfc031a9a6b0 + 720af493900b2f2bdc48e9ee12577983a5c9be36 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 87b644061..5154a1fb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.22462.6 + 7.0.0-beta.22464.4 diff --git a/global.json b/global.json index 2735d8bee..b1eb0b472 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22425.9", + "dotnet": "7.0.100-rc.1.22431.12", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22462.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22462.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22464.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22464.4" } } From 585d4d01cc1d326bf5fcb0ef6eb105a2a9e2a437 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 20 Sep 2022 13:55:58 -0700 Subject: [PATCH 46/62] [release/7.0.1xx] Fix GitHub Codespaces source-build prebuild (#14554) * Unset RepositoryName in Codespaces script * Add devcontainer config to CODEOWNERS --- .devcontainer/source-build-scripts/buildTarball.sh | 6 +++++- CODEOWNERS | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.devcontainer/source-build-scripts/buildTarball.sh b/.devcontainer/source-build-scripts/buildTarball.sh index d62e353e4..d1b714e77 100755 --- a/.devcontainer/source-build-scripts/buildTarball.sh +++ b/.devcontainer/source-build-scripts/buildTarball.sh @@ -5,4 +5,8 @@ cd $(realpath ..)/dotnet-source/ ./prep.sh -./build.sh --online --clean-while-building || true \ No newline at end of file + +# GitHub Codespaces automatically sets RepositoryName, which conflicts with source-build scripts. +unset RepositoryName + +./build.sh --online --clean-while-building || true diff --git a/CODEOWNERS b/CODEOWNERS index df0cb831e..671ebdfe5 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -3,5 +3,6 @@ # Snaps +/.devcontainer/ @dotnet/source-build-internal /src/snaps/ @rbhanda -/src/SourceBuild/ @dotnet/source-build-internal \ No newline at end of file +/src/SourceBuild/ @dotnet/source-build-internal From d9ad491ad03f1ae92710a7e8a57e427c60972d18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Sep 2022 16:35:43 -0500 Subject: [PATCH 47/62] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14538) * Update dependencies from https://github.com/dotnet/sdk build 20220916.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.64 -> To Version 7.0.100-rtm.22466.5 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.0-rc.2.22465.19 -> To Version 7.0.0-rc.2.22465.27 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220916.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.64 -> To Version 7.0.100-rtm.22466.11 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build From Version 7.0.0-rc.2.22465.19 -> To Version 7.0.0-rc.2.22465.27 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220916.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.64 -> To Version 7.0.100-rtm.22466.19 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build From Version 7.0.0-rc.2.22465.19 -> To Version 7.0.0-rc.2.22465.27 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220918.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.64 -> To Version 7.0.100-rtm.22468.4 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build From Version 7.0.0-rc.2.22465.19 -> To Version 7.0.0-rc.2.22465.27 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220919.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.64 -> To Version 7.0.100-rtm.22469.3 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22465.3 -> To Version 7.0.0-rtm.22466.6 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflict * Update dependencies from https://github.com/dotnet/sdk build 20220919.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22465.64 -> To Version 7.0.100-rtm.22469.9 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22465.3 -> To Version 7.0.0-rtm.22466.6 (parent: Microsoft.NET.Sdk * Resolve source-build patch conflicts * Look for msbuild net7.0 artifacts instead of net6.0 Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons Co-authored-by: Logan Bussell --- eng/Version.Details.xml | 80 ++++----- eng/Versions.props | 34 ++-- ...001-Change-TargetFramework-to-net7.0.patch | 6 +- .../patches/sdk/0001-Disable-CA1420.patch | 5 +- ...002-Change-TargetFramework-to-net7.0.patch | 164 ------------------ ...02-Look-for-msbuild-net7.0-artifacts.patch | 24 +++ 6 files changed, 86 insertions(+), 227 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch create mode 100644 src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 230e3aa75..a34a7d56c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - ee6cde5defb8d697d4a28602d072a3784890728f + 43a11661ae9bacdd847663207bef79fe93d69df7 - + https://github.com/dotnet/runtime - ee6cde5defb8d697d4a28602d072a3784890728f + 43a11661ae9bacdd847663207bef79fe93d69df7 - + https://github.com/dotnet/runtime - ee6cde5defb8d697d4a28602d072a3784890728f + 43a11661ae9bacdd847663207bef79fe93d69df7 - + https://github.com/dotnet/runtime - ee6cde5defb8d697d4a28602d072a3784890728f + 43a11661ae9bacdd847663207bef79fe93d69df7 - + https://github.com/dotnet/runtime - ee6cde5defb8d697d4a28602d072a3784890728f + 43a11661ae9bacdd847663207bef79fe93d69df7 - + https://github.com/dotnet/runtime - ee6cde5defb8d697d4a28602d072a3784890728f + 43a11661ae9bacdd847663207bef79fe93d69df7 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ee6cde5defb8d697d4a28602d072a3784890728f + 43a11661ae9bacdd847663207bef79fe93d69df7 - + https://github.com/dotnet/aspnetcore - 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f + 282f781c30da7b813099cd7878600368dffac804 - + https://github.com/dotnet/aspnetcore - 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f + 282f781c30da7b813099cd7878600368dffac804 - + https://github.com/dotnet/aspnetcore - 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f + 282f781c30da7b813099cd7878600368dffac804 - + https://github.com/dotnet/aspnetcore - 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f + 282f781c30da7b813099cd7878600368dffac804 - + https://github.com/dotnet/aspnetcore - 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f + 282f781c30da7b813099cd7878600368dffac804 - + https://github.com/dotnet/aspnetcore - 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f + 282f781c30da7b813099cd7878600368dffac804 - + https://github.com/dotnet/aspnetcore - 5b84d4cdd4a292acca5ed1b92440bb9f19100f5f + 282f781c30da7b813099cd7878600368dffac804 https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 946938fab4bc986b5cfb0490e0adf22b93d388ef + a50339473c041a9099a27b808b09e1faf506920b - + https://github.com/dotnet/sdk - 946938fab4bc986b5cfb0490e0adf22b93d388ef + a50339473c041a9099a27b808b09e1faf506920b - + https://github.com/dotnet/sdk - 946938fab4bc986b5cfb0490e0adf22b93d388ef + a50339473c041a9099a27b808b09e1faf506920b - + https://github.com/dotnet/sdk - 946938fab4bc986b5cfb0490e0adf22b93d388ef + a50339473c041a9099a27b808b09e1faf506920b @@ -154,14 +154,14 @@ 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 6033e4c95bcd9fa31ebe9b52462c15521cda8f62 + 48ab5664b8734afdf4aedba5f72a0663435eef16 - + https://github.com/nuget/nuget.client - fa9f471daebb817384840d162acc9a9592f88ce8 + abaa72f3390fba4bb65fb3c700f22104682bfae9 diff --git a/eng/Versions.props b/eng/Versions.props index 5154a1fb7..0b9237f44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,38 +50,38 @@ - 7.0.0-rc.2.22465.19 - 7.0.0-rc.2.22465.19 - 7.0.0-rc.2.22465.19 - 7.0.0-rc.2.22465.19 - 7.0.0-rc.2.22465.19 - 7.0.0-rc.2.22465.19 - 7.0.0-rc.2.22465.19 + 7.0.0-rtm.22466.18 + 7.0.0-rtm.22466.18 + 7.0.0-rtm.22466.18 + 7.0.0-rtm.22466.18 + 7.0.0-rtm.22466.18 + 7.0.0-rtm.22466.18 + 7.0.0-rtm.22466.18 0.2.0 - 7.0.100-rtm.22465.64 - 7.0.100-rtm.22465.64 - 7.0.100-rtm.22465.64 + 7.0.100-rtm.22469.9 + 7.0.100-rtm.22469.9 + 7.0.100-rtm.22469.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22465.3 + 7.0.0-rtm.22466.6 - 7.0.0-rtm.22465.3 - 7.0.0-rtm.22465.3 - 7.0.0-rtm.22465.3 - 7.0.0-rtm.22465.3 - 7.0.0-rtm.22465.3 - 7.0.0-rtm.22465.3 + 7.0.0-rtm.22466.6 + 7.0.0-rtm.22466.6 + 7.0.0-rtm.22466.6 + 7.0.0-rtm.22466.6 + 7.0.0-rtm.22466.6 + 7.0.0-rtm.22466.6 2.1.0 diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch index bf87a65d5..660d2c914 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch @@ -88,11 +88,11 @@ index 471f88dbc..efd25efd1 100644 "allowPrerelease": true }, "tools": { -- "dotnet": "6.0.200", +- "dotnet": "6.0.401", + "dotnet": "7.0.100-preview.5.22307.18", "vs": { - "version": "17.0" - } + "version": "17.2.1" + }, diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1 index ef1959fc3..8cfecb6a0 100644 --- a/scripts/Deploy-MSBuild.ps1 diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch index c329100ec..daaa95b6a 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch @@ -13,9 +13,8 @@ index 1353696a29..4e7463a453 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,9 +14,11 @@ - - net6.0 + + $(SdkTargetFramework) - diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch deleted file mode 100644 index ae0617daa..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Fri, 22 Jul 2022 15:10:08 -0700 -Subject: [PATCH] Change TargetFramework to net7.0 - ---- - Directory.Build.props | 2 ++ - .../Microsoft.DotNet.ApiCompat.Task.csproj | 2 +- - .../build/Microsoft.DotNet.ApiCompat.Task.targets | 2 +- - .../Microsoft.DotNet.ApiCompat.Tool.csproj | 2 +- - .../Microsoft.DotNet.ApiCompatibility.csproj | 2 +- - .../Microsoft.DotNet.PackageValidation.csproj | 2 +- - .../Microsoft.Extensions.DotNetDeltaApplier.csproj | 2 +- - .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - src/Layout/redist/targets/GenerateLayout.targets | 2 +- - src/Layout/redist/targets/OverlaySdkOnLKG.targets | 2 +- - .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 4 ++-- - 11 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 809b7c0668..10d7f2e1a2 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -17,6 +17,8 @@ - - net6.0 -+ -+ $(SdkTargetFramework) - - - true -diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj -index 4d148d1360..8e2f52a7ac 100644 ---- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj -+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ net7.0 - Exe - enable - true -diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj -index 4ee0173f24..c72ac850d1 100644 ---- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj -+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0;net472 -+ net7.0;net472 - Open - enable - -diff --git a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -index aa6de655f5..fca12f7f67 100644 ---- a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -+++ b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0;net472 -+ net7.0;net472 - Open - enable - -diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj -index 40927ae1f2..3c2236e38d 100644 ---- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj -+++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0 -+ net7.0 - MicrosoftAspNetCore - - false -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 03ea923734..3246138cf9 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -@@ -22,7 +22,7 @@ - - - -- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll -+ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll - - - -diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets -index 148464df9e..d399fe6f29 100644 ---- a/src/Layout/redist/targets/GenerateLayout.targets -+++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -196,7 +196,7 @@ - - - -- -+ - - - -diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets -index b31188d592..4052c1581b 100644 ---- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets -+++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets -@@ -77,7 +77,7 @@ - - - -- -+ - - - -diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj -index fddcbefd6f..4a1830bd19 100644 ---- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj -+++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj -@@ -1,8 +1,8 @@ -  - - -- net6.0;net472 -- net6.0 -+ $(ResolverTargetFramework);net472 -+ $(ResolverTargetFramework) - AnyCPU - win-x86;win-x64 - true diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch new file mode 100644 index 000000000..cf69f8b84 --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Tue, 20 Sep 2022 10:10:29 -0700 +Subject: [PATCH] Look for msbuild net7.0 artifacts + +This patch can be removed once https://github.com/dotnet/msbuild/pull/7790 flows +into dotnet/sdk, at which point that repo will need this change. +--- + .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +index 03ea923734..3246138cf9 100644 +--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj ++++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +@@ -22,7 +22,7 @@ + + + +- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll ++ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll + + + From 5780630218813a850e05f4205ba27c3ee1a828bc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 21 Sep 2022 10:35:17 -0500 Subject: [PATCH 48/62] Update Download MSFT sdk Tarball CI step to handle rtm in version # (#14558) --- .../eng/common/templates/job/source-build-build-tarball.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index b8feb43e3..1ebbfa1c2 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-preview*|-rc*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-preview*|-rc*|-rtm)-linux-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: From c8257bacff8523d5a9baf9d26b95494e8b42c406 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 21 Sep 2022 11:39:31 -0500 Subject: [PATCH 49/62] Patch out entrypoint warning in F# as a temporary workaround. --- ...o-entrypoint-warning-as-a-workaround.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/fsharp/0001-Patch-out-no-entrypoint-warning-as-a-workaround.patch diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Patch-out-no-entrypoint-warning-as-a-workaround.patch b/src/SourceBuild/tarball/patches/fsharp/0001-Patch-out-no-entrypoint-warning-as-a-workaround.patch new file mode 100644 index 000000000..cf5170293 --- /dev/null +++ b/src/SourceBuild/tarball/patches/fsharp/0001-Patch-out-no-entrypoint-warning-as-a-workaround.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 21 Sep 2022 11:38:27 -0500 +Subject: [PATCH] Patch out 'no entrypoint' warning as a workaround. + +--- + src/Compiler/AbstractIL/ilwrite.fs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Compiler/AbstractIL/ilwrite.fs b/src/Compiler/AbstractIL/ilwrite.fs +index 983159604..adc338bc1 100644 +--- a/src/Compiler/AbstractIL/ilwrite.fs ++++ b/src/Compiler/AbstractIL/ilwrite.fs +@@ -3143,7 +3143,6 @@ let generateIL ( + if isDll then 0x0 + else getUncodedToken (if epHere then TableNames.Method else TableNames.File) tok + | None -> +- if not isDll then dprintn "warning: no entrypoint specified in executable binary" + 0x0 + + let pdbData = From 67f11ac2b804d9bd6596689196b0445ac096077d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 22 Sep 2022 10:31:42 -0500 Subject: [PATCH 50/62] Fix Download MSFT sdk Tarball pattern (#14567) --- .../eng/common/templates/job/source-build-build-tarball.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 1ebbfa1c2..9de76621f 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-preview*|-rc*|-rtm)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: From d8539f21acb3310e1a416efa6b623d3568d3225f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 12:12:23 -0500 Subject: [PATCH 51/62] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220922.1 (#14568) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22466.3 -> To Version 7.0.0-alpha.1.22472.1 Co-authored-by: dotnet-maestro[bot] --- 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 a34a7d56c..9d8305943 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/source-build-reference-packages - 6d1119ce3caac7e29f7e44c6be80494345f9de2a + 6fa7fd0c2ee87efd6a394a6ec33730485a0e6344 From e518296d7b799ed496a18bd271d18e884e52a987 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 01:01:00 +0000 Subject: [PATCH 52/62] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220922.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22472.1 -> To Version 7.0.0-alpha.1.22472.3 --- 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 9d8305943..686570c21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/source-build-reference-packages - 6fa7fd0c2ee87efd6a394a6ec33730485a0e6344 + f23834cc527b7b88a3600ab8cd857eab93cca0a6 From e607eccbb47bb3e75fc78eadd926f73a08b2ca7f Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 23 Sep 2022 14:35:57 -0700 Subject: [PATCH 53/62] [release/7.0.1xx] Update SBRP and address issue in DependencyPackageProjects infra (#14577) * Update SBRP and address issue in DependencyPackageProjects infra * Update to official new version of SBRP * Fix typo Co-authored-by: MichaelSimons --- .../repos/source-build-reference-packages.proj | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj index 69ab564a2..a4fb27340 100644 --- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj +++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj @@ -2,7 +2,9 @@ - $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + $(BaseIntermediatePath)source-build-reference-package-cache + + $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory) $(ProjectDirectory)NuGet.config $(ProjectDirectory)global.json @@ -16,5 +18,15 @@ + + + + + + From 9d07ef497e496e0efcd623736136285dc8c47ab5 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 26 Sep 2022 11:27:10 -0700 Subject: [PATCH 54/62] [release/7.0.1xx] Remove unnecessary patches (#14570) * Remove Aspnetcore patch for IL2070 * Use different argument for skipping nodejs projects in aspnetcore * Update linker patch backport link * Remove unnecessary msbuild patch --- .../tarball/content/repos/aspnetcore.proj | 2 +- ...atch => 0001-Disable-warning-CS0618.patch} | 0 .../aspnetcore/0003-NoWarn-IL2070.patch | 22 ------------- ...n-t-override-BuildNodeJS-in-build.sh.patch | 22 ------------- ...slynAnalyzer-Microsoft.CodeAnalysis..patch | 2 +- ...ref-struct-in-Enumerator-constructor.patch | 31 ------------------- 6 files changed, 2 insertions(+), 77 deletions(-) rename src/SourceBuild/tarball/patches/aspnetcore/{0002-Disable-warning-CS0618.patch => 0001-Disable-warning-CS0618.patch} (100%) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0003-NoWarn-IL2070.patch delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0004-Don-t-override-BuildNodeJS-in-build.sh.patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 4eed64123..a779e9213 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -7,7 +7,7 @@ $(BuildCommandArgs) --arch $(Platform) $(BuildCommandArgs) --no-build-repo-tasks - $(BuildCommandArgs) /p:BuildNodeJs=false + $(BuildCommandArgs) --no-build-nodejs $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-Disable-warning-CS0618.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch similarity index 100% rename from src/SourceBuild/tarball/patches/aspnetcore/0002-Disable-warning-CS0618.patch rename to src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-NoWarn-IL2070.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-NoWarn-IL2070.patch deleted file mode 100644 index aa344aefa..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0003-NoWarn-IL2070.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 12 Aug 2022 23:02:54 +0000 -Subject: [PATCH] NoWarn IL2070 - -Backport: https://github.com/dotnet/aspnetcore/issues/43253 ---- - Directory.Build.props | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 166dbd6487..d5b1c9a1a8 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -113,6 +113,7 @@ - - $(NoWarn.Replace('1591', '')) - $(NoWarn);0105 -+ $(NoWarn);IL2070 - - - $(WarningsNotAsErrors);CS1591 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0004-Don-t-override-BuildNodeJS-in-build.sh.patch b/src/SourceBuild/tarball/patches/aspnetcore/0004-Don-t-override-BuildNodeJS-in-build.sh.patch deleted file mode 100644 index e006dc156..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0004-Don-t-override-BuildNodeJS-in-build.sh.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 15 Aug 2022 16:21:57 -0700 -Subject: [PATCH] Don't override BuildNodeJS in build.sh - -Backport: https://github.com/dotnet/aspnetcore/issues/43310 ---- - eng/build.sh | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/eng/build.sh b/eng/build.sh -index a6b6ba99be..0e4daad48c 100755 ---- a/eng/build.sh -+++ b/eng/build.sh -@@ -271,7 +271,6 @@ fi - # Only set these MSBuild properties if they were explicitly set by build parameters. - [ ! -z "$build_java" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildJava=$build_java" - [ ! -z "$build_native" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNative=$build_native" --[ ! -z "$build_nodejs" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNodeJS=$build_nodejs" - [ ! -z "$build_managed" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildManaged=$build_managed" - [ ! -z "$build_installers" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildInstallers=$build_installers" - diff --git a/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch b/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch index b35252048..d9bae526a 100644 --- a/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch +++ b/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch @@ -4,7 +4,7 @@ Date: Fri, 12 Aug 2022 20:58:39 +0000 Subject: [PATCH] Update ILLink.RoslynAnalyzer Microsoft.CodeAnalysis.CSharp reference for source-build -backport: https://github.com/dotnet/source-build/issues/2973 +backport: https://github.com/dotnet/linker/pull/3045 --- src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch deleted file mode 100644 index 7a7d5bf8f..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0002-Don-t-use-ref-struct-in-Enumerator-constructor.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Wed, 3 Aug 2022 10:37:03 -0700 -Subject: [PATCH] Don't use ref struct in Enumerator constructor - ---- - src/StringTools/InternableString.cs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/StringTools/InternableString.cs b/src/StringTools/InternableString.cs -index f04d2a9e9..dc788767a 100644 ---- a/src/StringTools/InternableString.cs -+++ b/src/StringTools/InternableString.cs -@@ -33,7 +33,7 @@ namespace Microsoft.NET.StringTools - /// - private int _charIndex; - -- internal Enumerator(ref InternableString str) -+ internal Enumerator(InternableString str) - { - _string = str; - _spanIndex = -1; -@@ -170,7 +170,7 @@ namespace Microsoft.NET.StringTools - /// The enumerator. - public Enumerator GetEnumerator() - { -- return new Enumerator(ref this); -+ return new Enumerator(this); - } - - /// From edfb35504cd2ce4bbc8de48f2933c01976cdc5ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 18:20:04 +0000 Subject: [PATCH 55/62] Update dependencies from https://github.com/dotnet/sdk build 20220927.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22469.9 -> To Version 7.0.100-rtm.22477.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22464.4 -> To Version 7.0.0-rtm.22476.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 52 ++++++++-------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686570c21..de9098596 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - d13406fbc7a6429aec0e459402283ab760b2bdfe + a057fddda78b344697d430c536b1457566a4d06f - + https://github.com/dotnet/windowsdesktop - d13406fbc7a6429aec0e459402283ab760b2bdfe + a057fddda78b344697d430c536b1457566a4d06f - + https://github.com/dotnet/windowsdesktop - d13406fbc7a6429aec0e459402283ab760b2bdfe + a057fddda78b344697d430c536b1457566a4d06f - + https://github.com/dotnet/windowsdesktop - d13406fbc7a6429aec0e459402283ab760b2bdfe + a057fddda78b344697d430c536b1457566a4d06f https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + a81424175e994a8f0253a333db279758b6940742 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + a81424175e994a8f0253a333db279758b6940742 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + a81424175e994a8f0253a333db279758b6940742 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + a81424175e994a8f0253a333db279758b6940742 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + a81424175e994a8f0253a333db279758b6940742 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + a81424175e994a8f0253a333db279758b6940742 - + https://github.com/dotnet/aspnetcore - 282f781c30da7b813099cd7878600368dffac804 + a81424175e994a8f0253a333db279758b6940742 https://github.com/dotnet/test-templates @@ -103,49 +103,49 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - a50339473c041a9099a27b808b09e1faf506920b + 36742fd0c72f329123105b0cceefbe8ed8e48782 - + https://github.com/dotnet/sdk - a50339473c041a9099a27b808b09e1faf506920b + 36742fd0c72f329123105b0cceefbe8ed8e48782 - + https://github.com/dotnet/sdk - a50339473c041a9099a27b808b09e1faf506920b + 36742fd0c72f329123105b0cceefbe8ed8e48782 - + https://github.com/dotnet/sdk - a50339473c041a9099a27b808b09e1faf506920b + 36742fd0c72f329123105b0cceefbe8ed8e48782 - + https://github.com/dotnet/winforms - a332a1fec8ddac6172ac149ff46c085cf2beeb43 + 993983be2ce14ca67f7ff09b8b04e9b8391b3339 - + https://github.com/dotnet/wpf - c9a6d9f821616f6f119088d50da6d0d0ce4891d5 + a956caa0747c27f0b0776d845fafe0b05b2c7337 - + https://github.com/dotnet/fsharp - 1f56aa9c36d2919ba52c5b4f5abd449161e7ca01 + 4c4c3894bb118332e036ad99fcff1de89d6af307 - + https://github.com/dotnet/fsharp - 1f56aa9c36d2919ba52c5b4f5abd449161e7ca01 + 4c4c3894bb118332e036ad99fcff1de89d6af307 - + https://github.com/microsoft/vstest - 3c560f92eb7832d353f9cbeaa120b234e02ef027 + 576a7cc1b259976393cf576a6a9c5df967bb2b7d - + https://github.com/dotnet/linker - 5f9bfd94d9c687207872ae03f751ea19704381c0 + 219e84c88def8276179f66282b2f7cb5f1d0d126 linker @@ -154,27 +154,27 @@ 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 48ab5664b8734afdf4aedba5f72a0663435eef16 + c7d758591e31a066212058d589759c580336deff - + https://github.com/nuget/nuget.client - abaa72f3390fba4bb65fb3c700f22104682bfae9 + cf1e6b6fd314fc510d1b64feed6b10515c202bec https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 76e6b338e87093ddc9b3b650f027706aba65d388 + 6625add9a3eadc2954af0311be35290cfefcddb0 - + https://github.com/dotnet/emsdk - 76e6b338e87093ddc9b3b650f027706aba65d388 + 6625add9a3eadc2954af0311be35290cfefcddb0 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 0b9237f44..b8a438cbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rc.2.22431.7 + 7.0.0-rtm.22476.8 - 7.0.0-rc.2.22431.6 + 7.0.0-rtm.22476.6 @@ -50,46 +50,46 @@ - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 - 7.0.0-rtm.22466.18 + 7.0.0-rtm.22476.23 + 7.0.0-rtm.22476.23 + 7.0.0-rtm.22476.23 + 7.0.0-rtm.22476.23 + 7.0.0-rtm.22476.23 + 7.0.0-rtm.22476.23 + 7.0.0-rtm.22476.23 0.2.0 - 7.0.100-rtm.22469.9 - 7.0.100-rtm.22469.9 - 7.0.100-rtm.22469.9 + 7.0.100-rtm.22477.6 + 7.0.100-rtm.22477.6 + 7.0.100-rtm.22477.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22466.6 + 7.0.0-rtm.22476.2 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 - 7.0.0-rtm.22466.6 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 2.1.0 - 7.0.0-rtm.22464.4 - 7.0.0-rtm.22464.4 - 7.0.0-rtm.22464.4 - 7.0.0-rtm.22464.4 + 7.0.0-rtm.22476.10 + 7.0.0-rtm.22476.10 + 7.0.0-rtm.22476.10 + 7.0.0-rtm.22476.10 @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220915-01 + 17.4.0-release-20220926-01 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.2.22459.3 - 7.0.0-rc.2.22459.3 + 7.0.0-rc.2.22465.1 + 7.0.0-rc.2.22465.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From bc18c99cad65d220cc0ad74c3455c5495b0a2af8 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 27 Sep 2022 14:27:01 -0500 Subject: [PATCH 56/62] Update MsftToSbSdk.diff baseline and remove redundant xml doc test (#14580) --- .../XmlDocTests.cs | 48 - .../assets/baselines/MissingXmlDoc.txt | 271 ---- .../assets/baselines/MsftToSbSdk.diff | 1173 +++++++++++------ 3 files changed, 764 insertions(+), 728 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs deleted file mode 100644 index e343eb59a..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Xunit; -using Xunit.Abstractions; - -namespace Microsoft.DotNet.SourceBuild.SmokeTests; - -public class XmlDocTests : SmokeTests -{ - public XmlDocTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - - /// - /// Verifies every targeting pack assembly has a xml doc file. - /// There are exceptions which are specified in baselines/XmlDocIgnore.*.txt. - /// - // TODO: Re-enable with https://github.com/orgs/dotnet/projects/101/views/1?filterQuery=doc - //[Fact] - public void VerifyTargetingPacksHaveDoc() - { - List missingXmlDoc = new(); - - string targetingPacksDirectory = Path.Combine(Config.DotNetDirectory, "packs"); - foreach (string targetingPackAssembly in Directory.EnumerateFiles(targetingPacksDirectory, "*.dll", SearchOption.AllDirectories)) - { - if (targetingPackAssembly.EndsWith("resources.dll")) - { - continue; - } - - string xmlFile = Path.ChangeExtension(targetingPackAssembly, ".xml"); - if (!File.Exists(xmlFile)) - { - string pathWithoutPacksPrefix = xmlFile[(targetingPacksDirectory.Length + 1)..]; - string[] pathParts = pathWithoutPacksPrefix.Split(Path.DirectorySeparatorChar); - string pathWithoutVersion = string.Join(Path.DirectorySeparatorChar, pathParts.Take(1).Concat(pathParts.Skip(2))); - pathWithoutVersion = BaselineHelper.RemoveNetTfmPaths(pathWithoutVersion); - missingXmlDoc.Add(pathWithoutVersion); - } - } - - BaselineHelper.CompareEntries("MissingXmlDoc.txt", missingXmlDoc.OrderBy(entry => entry)); - } -} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt deleted file mode 100644 index 6ccdf4f8a..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ /dev/null @@ -1,271 +0,0 @@ -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/Microsoft.AspNetCore.OutputCaching.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.xml -Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.CSharp.xml -Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.Core.xml -Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Registry.xml -Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.AppContext.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Buffers.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Concurrent.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Immutable.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.NonGeneric.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Specialized.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.Annotations.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.EventBasedAsync.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.TypeConverter.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Console.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.Common.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.DataSetExtensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Contracts.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Debug.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.DiagnosticSource.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.FileVersionInfo.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Process.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.StackTrace.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.TextWriterTraceListener.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tools.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.TraceSource.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tracing.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Dynamic.Runtime.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Formats.Asn1.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Formats.Tar.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Calendars.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.Brotli.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.ZipFile.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.AccessControl.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.DriveInfo.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Watcher.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.IsolatedStorage.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.MemoryMappedFiles.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Pipes.AccessControl.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Pipes.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.UnmanagedMemoryStream.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Expressions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Parallel.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Queryable.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Memory.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Http.Json.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Http.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.HttpListener.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Mail.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.NameResolution.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.NetworkInformation.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Ping.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Requests.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Security.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.ServicePoint.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Sockets.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebClient.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebHeaderCollection.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebProxy.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebSockets.Client.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebSockets.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.Vectors.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ObjectModel.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.DispatchProxy.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.ILGeneration.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.Lightweight.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Metadata.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.TypeExtensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Reader.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.ResourceManager.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Writer.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.VisualC.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Handles.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.InteropServices.RuntimeInformation.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.InteropServices.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Intrinsics.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Loader.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Numerics.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Formatters.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Json.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Xml.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.AccessControl.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Claims.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Algorithms.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Cng.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Csp.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Encoding.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.OpenSsl.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.X509Certificates.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.Windows.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.SecureString.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.CodePages.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encodings.Web.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Json.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.RegularExpressions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Channels.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Overlapped.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Dataflow.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Parallel.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Thread.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.ThreadPool.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Timer.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.Local.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ValueTuple.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.HttpUtility.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.ReaderWriter.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XDocument.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlDocument.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlSerializer.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XPath.XDocument.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XPath.xml -NETStandard.Library.Ref/ref/netstandard2.1/Microsoft.Win32.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/mscorlib.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.AppContext.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Buffers.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Concurrent.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.NonGeneric.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Specialized.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Composition.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.EventBasedAsync.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.TypeConverter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Console.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Core.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.Common.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Contracts.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Debug.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.FileVersionInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Process.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.StackTrace.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TextWriterTraceListener.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tools.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TraceSource.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tracing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Dynamic.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Calendars.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.ZipFile.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.DriveInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Watcher.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.IsolatedStorage.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.MemoryMappedFiles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Pipes.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.UnmanagedMemoryStream.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Expressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Queryable.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Memory.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Http.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NameResolution.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NetworkInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Ping.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Requests.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Security.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Sockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebHeaderCollection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.Client.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.Vectors.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ObjectModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.DispatchProxy.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.ILGeneration.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.Lightweight.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Reader.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.ResourceManager.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Writer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.CompilerServices.VisualC.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Handles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.RuntimeInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Formatters.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Json.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Claims.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Algorithms.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Csp.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.X509Certificates.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Principal.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.SecureString.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ServiceModel.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.RegularExpressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Overlapped.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Thread.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.ThreadPool.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Timer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Transactions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ValueTuple.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Windows.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.ReaderWriter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlSerializer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 4c334fee4..ce4ee983a 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,23 +14,9 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/ @@ -43,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ @@ -63,13 +45,310 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ @@ ------------ @@ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.CSharp.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.CSharp.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.VisualBasic.Core.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.VisualBasic.Core.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.VisualBasic.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.VisualBasic.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Win32.Primitives.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Win32.Primitives.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Win32.Registry.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Win32.Registry.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/mscorlib.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/netstandard.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/netstandard.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.AppContext.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Buffers.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.Concurrent.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.Concurrent.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.Immutable.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.Immutable.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.NonGeneric.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.NonGeneric.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.Specialized.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.Specialized.xml +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Collections.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.Annotations.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.Annotations.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.DataAnnotations.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.DataAnnotations.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.EventBasedAsync.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.EventBasedAsync.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.Primitives.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.Primitives.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.TypeConverter.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.TypeConverter.xml +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ComponentModel.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Configuration.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Configuration.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Console.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Console.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Core.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Core.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Data.Common.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Data.Common.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Data.DataSetExtensions.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Data.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.Contracts.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.Contracts.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.Debug.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.FileVersionInfo.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.FileVersionInfo.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.Process.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.Process.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.StackTrace.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.StackTrace.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.TextWriterTraceListener.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.TextWriterTraceListener.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.Tools.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.TraceSource.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.TraceSource.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.Tracing.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.Tracing.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Drawing.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Drawing.Primitives.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Drawing.Primitives.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Drawing.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Dynamic.Runtime.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Tar.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Tar.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Globalization.Calendars.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Globalization.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Globalization.Extensions.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Compression.Brotli.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Compression.Brotli.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Compression.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Compression.FileSystem.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Compression.FileSystem.xml +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Compression.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Compression.ZipFile.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Compression.ZipFile.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.FileSystem.AccessControl.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.FileSystem.AccessControl.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.FileSystem.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.FileSystem.DriveInfo.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.FileSystem.DriveInfo.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.FileSystem.Primitives.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.FileSystem.Watcher.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.FileSystem.Watcher.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.IsolatedStorage.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.IsolatedStorage.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.MemoryMappedFiles.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.MemoryMappedFiles.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipes.AccessControl.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipes.AccessControl.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipes.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipes.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.IO.UnmanagedMemoryStream.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Linq.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Expressions.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Expressions.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Parallel.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Parallel.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Queryable.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Queryable.xml +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Linq.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Memory.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Memory.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Http.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Http.Json.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Http.Json.xml +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Http.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.HttpListener.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.HttpListener.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Mail.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Mail.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.NameResolution.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.NameResolution.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.NetworkInformation.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.NetworkInformation.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Ping.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Ping.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Primitives.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Primitives.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Quic.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Quic.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Requests.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Requests.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Security.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Security.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.ServicePoint.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.ServicePoint.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Sockets.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.Sockets.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebClient.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebClient.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebHeaderCollection.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebHeaderCollection.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebProxy.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebProxy.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebSockets.Client.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebSockets.Client.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebSockets.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.WebSockets.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Net.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Numerics.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Numerics.Vectors.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Numerics.Vectors.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Numerics.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ObjectModel.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ObjectModel.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.DispatchProxy.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.DispatchProxy.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Emit.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Emit.ILGeneration.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Emit.ILGeneration.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Emit.Lightweight.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Emit.Lightweight.xml +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Emit.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Extensions.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Metadata.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Metadata.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Primitives.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.Primitives.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.TypeExtensions.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Reflection.TypeExtensions.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Resources.Reader.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Resources.ResourceManager.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Resources.Writer.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Resources.Writer.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.VisualC.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.VisualC.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Extensions.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Handles.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.InteropServices.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.InteropServices.JavaScript.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.InteropServices.JavaScript.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.InteropServices.RuntimeInformation.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.InteropServices.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Intrinsics.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Intrinsics.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Loader.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Loader.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Numerics.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Numerics.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.Formatters.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.Formatters.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.Json.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.Json.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.Primitives.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.Primitives.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.Xml.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.Serialization.Xml.xml +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Claims.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Claims.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Algorithms.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Cng.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Csp.dll +@@ ------------ @@ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.OpenSsl.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Primitives.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.X509Certificates.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Principal.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Principal.Windows.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.Principal.Windows.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.SecureString.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Security.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ServiceModel.Web.dll +@@ ------------ @@ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ServiceProcess.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ServiceProcess.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encoding.CodePages.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encoding.CodePages.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encoding.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encoding.Extensions.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encoding.Extensions.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.RegularExpressions.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Text.RegularExpressions.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Channels.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Channels.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Overlapped.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Overlapped.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Tasks.Dataflow.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Tasks.Dataflow.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Tasks.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Tasks.Extensions.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Tasks.Parallel.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Tasks.Parallel.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Thread.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Thread.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.ThreadPool.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.ThreadPool.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.Timer.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Threading.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Transactions.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Transactions.Local.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Transactions.Local.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Transactions.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.ValueTuple.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Web.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Web.HttpUtility.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Web.HttpUtility.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Web.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Windows.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Windows.xml +@@ ------------ @@ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.Linq.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.Linq.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.ReaderWriter.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.ReaderWriter.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.Serialization.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.Serialization.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XDocument.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XDocument.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XmlDocument.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XmlSerializer.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XmlSerializer.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XPath.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XPath.XDocument.dll +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XPath.XDocument.xml +-./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XPath.xml + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/WindowsBase.dll + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ref/netx.y/WindowsBase.xml + ./packs/NETStandard.Library.Ref/ +@@ ------------ @@ + ./sdk/x.y.z/.version + ./sdk/x.y.z/AppHostTemplate/ ./sdk/x.y.z/AppHostTemplate/apphost +-./sdk/x.y.z/arm64/ +-./sdk/x.y.z/arm64/dbghelp.dll ./sdk/x.y.z/cs/ ./sdk/x.y.z/cs/dotnet.resources.dll -./sdk/x.y.z/cs/Microsoft.Build.NuGetSdkResolver.resources.dll ./sdk/x.y.z/cs/Microsoft.Build.resources.dll ./sdk/x.y.z/cs/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/cs/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/cs/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/cs/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -80,7 +359,6 @@ index ------------ -./sdk/x.y.z/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/cs/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/cs/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -105,18 +383,28 @@ index ------------ -./sdk/x.y.z/cs/NuGet.Versioning.resources.dll -./sdk/x.y.z/cs/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/cs/System.CommandLine.resources.dll +-./sdk/x.y.z/cs/Test.Utility.resources.dll -./sdk/x.y.z/cs/vstest.console.resources.dll ./sdk/x.y.z/Current/ ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ @@ ------------ @@ + ./sdk/x.y.z/datacollector.deps.json + ./sdk/x.y.z/datacollector.dll + ./sdk/x.y.z/datacollector.dll.config +-./sdk/x.y.z/datacollector.exe ./sdk/x.y.z/datacollector.runtimeconfig.json +-./sdk/x.y.z/dbghelp.dll ./sdk/x.y.z/de/ ./sdk/x.y.z/de/dotnet.resources.dll -./sdk/x.y.z/de/Microsoft.Build.NuGetSdkResolver.resources.dll ./sdk/x.y.z/de/Microsoft.Build.resources.dll ./sdk/x.y.z/de/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/de/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/de/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/de/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/de/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -127,7 +415,6 @@ index ------------ -./sdk/x.y.z/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/de/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/de/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -152,45 +439,46 @@ index ------------ -./sdk/x.y.z/de/NuGet.Versioning.resources.dll -./sdk/x.y.z/de/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/de/System.CommandLine.resources.dll +-./sdk/x.y.z/de/Test.Utility.resources.dll -./sdk/x.y.z/de/vstest.console.resources.dll ./sdk/x.y.z/dotnet-watch.deps.json ./sdk/x.y.z/dotnet-watch.runtimeconfig.json ./sdk/x.y.z/dotnet.deps.json @@ ------------ @@ - ./sdk/x.y.z/dotnet.runtimeconfig.json - ./sdk/x.y.z/DotnetTools/ - ./sdk/x.y.z/DotnetTools/dotnet-dev-certs/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml - ./sdk/x.y.z/DotnetTools/dotnet-format/ - ./sdk/x.y.z/DotnetTools/dotnet-format/cs/ - ./sdk/x.y.z/DotnetTools/dotnet-format/cs/dotnet-format.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Features.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Workspaces.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Elfie.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Features.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Scripting.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.VisualBasic.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Extensions.Logging.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Extensions.Options.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Extensions.Primitives.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.Win32.SystemEvents.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/pl/ + ./sdk/x.y.z/DotnetTools/dotnet-format/pl/dotnet-format.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/pl/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/ru/System.CommandLine.resources.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ + ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/netx.y/System.Drawing.Common.dll +./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/ +./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/ +./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/ +./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ + ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ + ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ + ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Drawing.Common.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Windows.Extensions.dll +./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.dll @@ -200,10 +488,13 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.Hosting.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.Runtime.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.TypedParts.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Diagnostics.DiagnosticSource.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/System.Configuration.ConfigurationManager.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/System.Drawing.Common.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.IO.Pipelines.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll +-./sdk/x.y.z/DotnetTools/dotnet-format/System.Windows.Extensions.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Runtime.CompilerServices.Unsafe.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encodings.Web.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Json.dll @@ -211,86 +502,46 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/Microsoft.CodeAnalysis.Workspaces.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Elfie.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Features.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Scripting.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Workspaces.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Workspaces.MSBuild.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.DiaSymReader.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Win32.SystemEvents.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Hosting.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Runtime.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.TypedParts.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.IO.Pipelines.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Configuration.ConfigurationManager.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Drawing.Common.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -302,6 +553,10 @@ index ------------ ./sdk/x.y.z/es/Microsoft.Build.resources.dll ./sdk/x.y.z/es/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/es/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/es/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/es/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/es/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -312,7 +567,6 @@ index ------------ -./sdk/x.y.z/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/es/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/es/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -337,6 +591,7 @@ index ------------ -./sdk/x.y.z/es/NuGet.Versioning.resources.dll -./sdk/x.y.z/es/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/es/System.CommandLine.resources.dll +-./sdk/x.y.z/es/Test.Utility.resources.dll -./sdk/x.y.z/es/vstest.console.resources.dll ./sdk/x.y.z/Extensions/ -./sdk/x.y.z/Extensions/cs/ @@ -351,6 +606,13 @@ index ------------ -./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll -./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll -./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/dump/ +-./sdk/x.y.z/Extensions/dump/DumpMinitool.arm64.exe +-./sdk/x.y.z/Extensions/dump/DumpMinitool.arm64.exe.config +-./sdk/x.y.z/Extensions/dump/DumpMinitool.exe +-./sdk/x.y.z/Extensions/dump/DumpMinitool.exe.config +-./sdk/x.y.z/Extensions/dump/DumpMinitool.x86.exe +-./sdk/x.y.z/Extensions/dump/DumpMinitool.x86.exe.config -./sdk/x.y.z/Extensions/es/ -./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll -./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll @@ -429,6 +691,10 @@ index ------------ ./sdk/x.y.z/fr/Microsoft.Build.resources.dll ./sdk/x.y.z/fr/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/fr/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/fr/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/fr/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -439,7 +705,6 @@ index ------------ -./sdk/x.y.z/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/fr/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/fr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -464,48 +729,35 @@ index ------------ -./sdk/x.y.z/fr/NuGet.Versioning.resources.dll -./sdk/x.y.z/fr/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/fr/System.CommandLine.resources.dll +-./sdk/x.y.z/fr/Test.Utility.resources.dll -./sdk/x.y.z/fr/vstest.console.resources.dll ./sdk/x.y.z/FSharp/ ./sdk/x.y.z/FSharp/cs/ ./sdk/x.y.z/FSharp/cs/FSharp.Build.resources.dll @@ ------------ @@ - ./sdk/x.y.z/FSharp/Microsoft.FSharp.Targets - ./sdk/x.y.z/FSharp/Microsoft.NET.StringTools.dll - ./sdk/x.y.z/FSharp/Microsoft.Portable.FSharp.Targets --./sdk/x.y.z/FSharp/Microsoft.Win32.SystemEvents.dll - ./sdk/x.y.z/FSharp/pl/ - ./sdk/x.y.z/FSharp/pl/FSharp.Build.resources.dll - ./sdk/x.y.z/FSharp/pl/FSharp.Compiler.Interactive.Settings.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/FSharp/ru/FSharp.Compiler.Service.resources.dll ./sdk/x.y.z/FSharp/ru/FSharp.Core.resources.dll ./sdk/x.y.z/FSharp/ru/FSharp.DependencyManager.Nuget.resources.dll --./sdk/x.y.z/FSharp/runtimes/ + ./sdk/x.y.z/FSharp/runtimes/ -./sdk/x.y.z/FSharp/runtimes/unix/ -./sdk/x.y.z/FSharp/runtimes/unix/lib/ --./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/ --./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/FSharp/runtimes/win/ --./sdk/x.y.z/FSharp/runtimes/win/lib/ --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/ --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/ --./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/FSharp/System.CodeDom.dll --./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll --./sdk/x.y.z/FSharp/System.Drawing.Common.dll +-./sdk/x.y.z/FSharp/runtimes/unix/lib/netx.y/ +-./sdk/x.y.z/FSharp/runtimes/unix/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/FSharp/runtimes/win/ + ./sdk/x.y.z/FSharp/runtimes/win/lib/ + ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/ + ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ++./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ++./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll + ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll + ./sdk/x.y.z/FSharp/System.CodeDom.dll + ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll ++./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.dll + ./sdk/x.y.z/FSharp/System.Drawing.Common.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll --./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll --./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll --./sdk/x.y.z/FSharp/System.Security.Permissions.dll --./sdk/x.y.z/FSharp/System.Windows.Extensions.dll - ./sdk/x.y.z/FSharp/tr/ - ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll - ./sdk/x.y.z/FSharp/tr/FSharp.Compiler.Interactive.Settings.resources.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./sdk/x.y.z/IncludedWorkloadManifests.txt ./sdk/x.y.z/it/ @@ -514,6 +766,10 @@ index ------------ ./sdk/x.y.z/it/Microsoft.Build.resources.dll ./sdk/x.y.z/it/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/it/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/it/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/it/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/it/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -524,7 +780,6 @@ index ------------ -./sdk/x.y.z/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/it/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/it/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -549,6 +804,7 @@ index ------------ -./sdk/x.y.z/it/NuGet.Versioning.resources.dll -./sdk/x.y.z/it/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/it/System.CommandLine.resources.dll +-./sdk/x.y.z/it/Test.Utility.resources.dll -./sdk/x.y.z/it/vstest.console.resources.dll ./sdk/x.y.z/ja/ ./sdk/x.y.z/ja/dotnet.resources.dll @@ -556,6 +812,10 @@ index ------------ ./sdk/x.y.z/ja/Microsoft.Build.resources.dll ./sdk/x.y.z/ja/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/ja/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/ja/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/ja/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -566,7 +826,6 @@ index ------------ -./sdk/x.y.z/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/ja/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/ja/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -591,6 +850,7 @@ index ------------ -./sdk/x.y.z/ja/NuGet.Versioning.resources.dll -./sdk/x.y.z/ja/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/ja/System.CommandLine.resources.dll +-./sdk/x.y.z/ja/Test.Utility.resources.dll -./sdk/x.y.z/ja/vstest.console.resources.dll ./sdk/x.y.z/ko/ ./sdk/x.y.z/ko/dotnet.resources.dll @@ -598,6 +858,10 @@ index ------------ ./sdk/x.y.z/ko/Microsoft.Build.resources.dll ./sdk/x.y.z/ko/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/ko/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/ko/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/ko/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -608,7 +872,6 @@ index ------------ -./sdk/x.y.z/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/ko/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/ko/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -633,18 +896,19 @@ index ------------ -./sdk/x.y.z/ko/NuGet.Versioning.resources.dll -./sdk/x.y.z/ko/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/ko/System.CommandLine.resources.dll +-./sdk/x.y.z/ko/Test.Utility.resources.dll -./sdk/x.y.z/ko/vstest.console.resources.dll ./sdk/x.y.z/Microsoft.ApplicationInsights.dll ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll ./sdk/x.y.z/Microsoft.Build.dll @@ ------------ @@ - ./sdk/x.y.z/Microsoft.DotNet.NativeWrapper.dll - ./sdk/x.y.z/Microsoft.DotNet.SdkResolver.dll - ./sdk/x.y.z/Microsoft.DotNet.TemplateLocator.dll --./sdk/x.y.z/Microsoft.Extensions.CommandLineUtils.dll - ./sdk/x.y.z/Microsoft.Extensions.Configuration.Abstractions.dll - ./sdk/x.y.z/Microsoft.Extensions.Configuration.Binder.dll - ./sdk/x.y.z/Microsoft.Extensions.Configuration.dll + ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll + ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll + ./sdk/x.y.z/Microsoft.Build.Utilities.Core.dll +-./sdk/x.y.z/Microsoft.CodeCoverage.IO.dll + ./sdk/x.y.z/Microsoft.Common.CrossTargeting.targets + ./sdk/x.y.z/Microsoft.Common.CurrentVersion.targets + ./sdk/x.y.z/Microsoft.Common.overridetasks @@ ------------ @@ ./sdk/x.y.z/Microsoft.TestPlatform.PlatformAbstractions.deps.json ./sdk/x.y.z/Microsoft.TestPlatform.PlatformAbstractions.dll @@ -656,21 +920,32 @@ index ------------ ./sdk/x.y.z/Microsoft.VisualBasic.CrossTargeting.targets ./sdk/x.y.z/Microsoft.VisualBasic.CurrentVersion.targets ./sdk/x.y.z/Microsoft.VisualBasic.targets --./sdk/x.y.z/Microsoft.VisualStudio.Coverage.IO.dll ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Client.dll ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Common.dll +./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll +./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.deps.json ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Arm.Resources.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.arm64.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Discoverer.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Arm.Resources.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.arm64.dll.manifest +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.dll.manifest +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.Resources.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Executor.x64.dll.manifest +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.Resources.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.TestEngine.dll +-./sdk/x.y.z/Microsoft.VisualStudio.TestTools.CppUnitTestFramework.x64.dll ./sdk/x.y.z/Microsoft.VisualStudioVersion.v11.Common.props ./sdk/x.y.z/Microsoft.VisualStudioVersion.v12.Common.props ./sdk/x.y.z/Microsoft.VisualStudioVersion.v14.Common.props - ./sdk/x.y.z/Microsoft.Win32.Msi.dll --./sdk/x.y.z/Microsoft.Win32.SystemEvents.dll - ./sdk/x.y.z/Microsoft/ - ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/ - ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.ConflictResolution.targets @@ ------------ @@ ./sdk/x.y.z/package.deps.json ./sdk/x.y.z/pl/ @@ -679,6 +954,10 @@ index ------------ ./sdk/x.y.z/pl/Microsoft.Build.resources.dll ./sdk/x.y.z/pl/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/pl/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/pl/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/pl/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -689,7 +968,6 @@ index ------------ -./sdk/x.y.z/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/pl/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/pl/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -714,6 +992,7 @@ index ------------ -./sdk/x.y.z/pl/NuGet.Versioning.resources.dll -./sdk/x.y.z/pl/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/pl/System.CommandLine.resources.dll +-./sdk/x.y.z/pl/Test.Utility.resources.dll -./sdk/x.y.z/pl/vstest.console.resources.dll ./sdk/x.y.z/pt-BR/ ./sdk/x.y.z/pt-BR/dotnet.resources.dll @@ -721,6 +1000,10 @@ index ------------ ./sdk/x.y.z/pt-BR/Microsoft.Build.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -731,7 +1014,6 @@ index ------------ -./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -756,13 +1038,11 @@ index ------------ -./sdk/x.y.z/pt-BR/NuGet.Versioning.resources.dll -./sdk/x.y.z/pt-BR/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/pt-BR/System.CommandLine.resources.dll +-./sdk/x.y.z/pt-BR/Test.Utility.resources.dll -./sdk/x.y.z/pt-BR/vstest.console.resources.dll ./sdk/x.y.z/ref/ -+./sdk/x.y.z/ref/Microsoft.TestPlatform.PlatformAbstractions.dll -+./sdk/x.y.z/ref/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - ./sdk/x.y.z/ref/MSBuild.dll - ./sdk/x.y.z/ref/mscorlib.dll - ./sdk/x.y.z/ref/netstandard.dll + ./sdk/x.y.z/ref/Microsoft.Build.Framework.dll + ./sdk/x.y.z/ref/Microsoft.Build.Utilities.Core.dll @@ ------------ @@ ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll @@ -770,11 +1050,10 @@ index ------------ +./sdk/x.y.z/Roslyn/bincore/runtimes/ +./sdk/x.y.z/Roslyn/bincore/runtimes/win/ +./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll - ./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll - ./sdk/x.y.z/Roslyn/bincore/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll ++./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll +./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll ./sdk/x.y.z/Roslyn/bincore/tr/ ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll @@ -787,6 +1066,10 @@ index ------------ ./sdk/x.y.z/ru/Microsoft.Build.resources.dll ./sdk/x.y.z/ru/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/ru/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/ru/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/ru/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -797,7 +1080,6 @@ index ------------ -./sdk/x.y.z/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/ru/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/ru/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -822,6 +1104,7 @@ index ------------ -./sdk/x.y.z/ru/NuGet.Versioning.resources.dll -./sdk/x.y.z/ru/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/ru/System.CommandLine.resources.dll +-./sdk/x.y.z/ru/Test.Utility.resources.dll -./sdk/x.y.z/ru/vstest.console.resources.dll ./sdk/x.y.z/RuntimeIdentifierGraph.json ./sdk/x.y.z/runtimes/ @@ -832,8 +1115,8 @@ index ------------ ./sdk/x.y.z/runtimes/any/native/NuGet.targets -./sdk/x.y.z/runtimes/unix/ -./sdk/x.y.z/runtimes/unix/lib/ --./sdk/x.y.z/runtimes/unix/lib/netcoreapp3.0/ --./sdk/x.y.z/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll +-./sdk/x.y.z/runtimes/unix/lib/netx.y/ +-./sdk/x.y.z/runtimes/unix/lib/netx.y/System.Drawing.Common.dll +./sdk/x.y.z/runtimes/browser/ +./sdk/x.y.z/runtimes/browser/lib/ +./sdk/x.y.z/runtimes/browser/lib/netx.y/ @@ -841,21 +1124,10 @@ index ------------ ./sdk/x.y.z/runtimes/win/ ./sdk/x.y.z/runtimes/win/lib/ ./sdk/x.y.z/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/runtimes/win/lib/netx.y/ + ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll --./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ --./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache - ./sdk/x.y.z/SdkResolvers/ - ./sdk/x.y.z/SdkResolvers/Microsoft.Build.NuGetSdkResolver/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -914,17 +1186,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netstandard2.0/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netx.y/ -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Collections.Immutable.dll @@ -934,20 +1195,9 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Runtime.CompilerServices.Unsafe.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props -@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/Microsoft.NET.Sdk.Web.Tasks.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ref/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ref/Microsoft.NET.Sdk.Web.Tasks.dll -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/ -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Icon.png -./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/LICENSE.TXT @@ -1134,25 +1384,271 @@ index ------------ +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.ProjectModel.dll +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Protocol.dll +./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Versioning.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/README.md ./sdk/x.y.z/System.CodeDom.dll ./sdk/x.y.z/System.CommandLine.dll --./sdk/x.y.z/System.Configuration.ConfigurationManager.dll -+./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll +-./sdk/x.y.z/System.ComponentModel.Composition.dll + ./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll --./sdk/x.y.z/System.Drawing.Common.dll - ./sdk/x.y.z/System.Resources.Extensions.dll --./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll -+./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/System.Security.Cryptography.Xml.dll --./sdk/x.y.z/System.Security.Permissions.dll + ./sdk/x.y.z/System.Drawing.Common.dll +@@ ------------ @@ + ./sdk/x.y.z/System.Security.Cryptography.Xml.dll + ./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll --./sdk/x.y.z/System.Windows.Extensions.dll -+./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll -+./sdk/x.y.z/System.Text.Json.dll -+./sdk/x.y.z/testhost.deps.json -+./sdk/x.y.z/testhost.dll + ./sdk/x.y.z/System.Windows.Extensions.dll +-./sdk/x.y.z/testhost-1.0.runtimeconfig.json +-./sdk/x.y.z/testhost-1.1.runtimeconfig.json +-./sdk/x.y.z/testhost-2.0.runtimeconfig.json +-./sdk/x.y.z/testhost-2.1.runtimeconfig.json +-./sdk/x.y.z/testhost-3.0.runtimeconfig.json +-./sdk/x.y.z/testhost-3.1.runtimeconfig.json +-./sdk/x.y.z/testhost-5.0.runtimeconfig.json +-./sdk/x.y.z/testhost-6.0.runtimeconfig.json +-./sdk/x.y.z/testhost-7.0.runtimeconfig.json +-./sdk/x.y.z/testhost-latest.runtimeconfig.json + ./sdk/x.y.z/testhost.deps.json + ./sdk/x.y.z/testhost.dll +-./sdk/x.y.z/TestHostNetFramework/ +-./sdk/x.y.z/TestHostNetFramework/cs/ +-./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/datacollector.arm64.exe +-./sdk/x.y.z/TestHostNetFramework/datacollector.arm64.exe.config +-./sdk/x.y.z/TestHostNetFramework/datacollector.exe +-./sdk/x.y.z/TestHostNetFramework/datacollector.exe.config +-./sdk/x.y.z/TestHostNetFramework/de/ +-./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/de/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/es/ +-./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/es/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/fr/ +-./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/it/ +-./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/it/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ja/ +-./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ko/ +-./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CommunicationUtilities.dll +-./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CoreUtilities.dll +-./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.CrossPlatEngine.dll +-./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.PlatformAbstractions.dll +-./sdk/x.y.z/TestHostNetFramework/Microsoft.TestPlatform.Utilities.dll +-./sdk/x.y.z/TestHostNetFramework/Microsoft.VisualStudio.TestPlatform.Common.dll +-./sdk/x.y.z/TestHostNetFramework/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll +-./sdk/x.y.z/TestHostNetFramework/Microsoft.Win32.Primitives.dll +-./sdk/x.y.z/TestHostNetFramework/netstandard.dll +-./sdk/x.y.z/TestHostNetFramework/Newtonsoft.Json.dll +-./sdk/x.y.z/TestHostNetFramework/NuGet.Frameworks.dll +-./sdk/x.y.z/TestHostNetFramework/pl/ +-./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pt-BR/ +-./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ru/ +-./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/System.AppContext.dll +-./sdk/x.y.z/TestHostNetFramework/System.Collections.Concurrent.dll +-./sdk/x.y.z/TestHostNetFramework/System.Collections.dll +-./sdk/x.y.z/TestHostNetFramework/System.Collections.Immutable.dll +-./sdk/x.y.z/TestHostNetFramework/System.Collections.NonGeneric.dll +-./sdk/x.y.z/TestHostNetFramework/System.Collections.Specialized.dll +-./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.dll +-./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.EventBasedAsync.dll +-./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.Primitives.dll +-./sdk/x.y.z/TestHostNetFramework/System.ComponentModel.TypeConverter.dll +-./sdk/x.y.z/TestHostNetFramework/System.Console.dll +-./sdk/x.y.z/TestHostNetFramework/System.Data.Common.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Contracts.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Debug.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.FileVersionInfo.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Process.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.StackTrace.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.TextWriterTraceListener.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Tools.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.TraceSource.dll +-./sdk/x.y.z/TestHostNetFramework/System.Diagnostics.Tracing.dll +-./sdk/x.y.z/TestHostNetFramework/System.Drawing.Primitives.dll +-./sdk/x.y.z/TestHostNetFramework/System.Dynamic.Runtime.dll +-./sdk/x.y.z/TestHostNetFramework/System.Globalization.Calendars.dll +-./sdk/x.y.z/TestHostNetFramework/System.Globalization.dll +-./sdk/x.y.z/TestHostNetFramework/System.Globalization.Extensions.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.Compression.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.Compression.ZipFile.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.DriveInfo.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.Primitives.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.FileSystem.Watcher.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.IsolatedStorage.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.MemoryMappedFiles.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.Pipes.dll +-./sdk/x.y.z/TestHostNetFramework/System.IO.UnmanagedMemoryStream.dll +-./sdk/x.y.z/TestHostNetFramework/System.Linq.dll +-./sdk/x.y.z/TestHostNetFramework/System.Linq.Expressions.dll +-./sdk/x.y.z/TestHostNetFramework/System.Linq.Parallel.dll +-./sdk/x.y.z/TestHostNetFramework/System.Linq.Queryable.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.Http.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.NameResolution.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.NetworkInformation.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.Ping.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.Primitives.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.Requests.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.Security.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.Sockets.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.WebHeaderCollection.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.WebSockets.Client.dll +-./sdk/x.y.z/TestHostNetFramework/System.Net.WebSockets.dll +-./sdk/x.y.z/TestHostNetFramework/System.ObjectModel.dll +-./sdk/x.y.z/TestHostNetFramework/System.Private.Uri.dll +-./sdk/x.y.z/TestHostNetFramework/System.Reflection.dll +-./sdk/x.y.z/TestHostNetFramework/System.Reflection.Extensions.dll +-./sdk/x.y.z/TestHostNetFramework/System.Reflection.Metadata.dll +-./sdk/x.y.z/TestHostNetFramework/System.Reflection.Primitives.dll +-./sdk/x.y.z/TestHostNetFramework/System.Resources.Reader.dll +-./sdk/x.y.z/TestHostNetFramework/System.Resources.ResourceManager.dll +-./sdk/x.y.z/TestHostNetFramework/System.Resources.Writer.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.CompilerServices.VisualC.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.Extensions.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.Handles.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.InteropServices.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.InteropServices.RuntimeInformation.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.Numerics.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Formatters.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Json.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Primitives.dll +-./sdk/x.y.z/TestHostNetFramework/System.Runtime.Serialization.Xml.dll +-./sdk/x.y.z/TestHostNetFramework/System.Security.Claims.dll +-./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Algorithms.dll +-./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Csp.dll +-./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Encoding.dll +-./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.Primitives.dll +-./sdk/x.y.z/TestHostNetFramework/System.Security.Cryptography.X509Certificates.dll +-./sdk/x.y.z/TestHostNetFramework/System.Security.Principal.dll +-./sdk/x.y.z/TestHostNetFramework/System.Security.SecureString.dll +-./sdk/x.y.z/TestHostNetFramework/System.Text.Encoding.dll +-./sdk/x.y.z/TestHostNetFramework/System.Text.Encoding.Extensions.dll +-./sdk/x.y.z/TestHostNetFramework/System.Text.RegularExpressions.dll +-./sdk/x.y.z/TestHostNetFramework/System.Threading.dll +-./sdk/x.y.z/TestHostNetFramework/System.Threading.Overlapped.dll +-./sdk/x.y.z/TestHostNetFramework/System.Threading.Tasks.dll +-./sdk/x.y.z/TestHostNetFramework/System.Threading.Tasks.Parallel.dll +-./sdk/x.y.z/TestHostNetFramework/System.Threading.Thread.dll +-./sdk/x.y.z/TestHostNetFramework/System.Threading.ThreadPool.dll +-./sdk/x.y.z/TestHostNetFramework/System.Threading.Timer.dll +-./sdk/x.y.z/TestHostNetFramework/System.ValueTuple.dll +-./sdk/x.y.z/TestHostNetFramework/System.Xml.ReaderWriter.dll +-./sdk/x.y.z/TestHostNetFramework/System.Xml.XDocument.dll +-./sdk/x.y.z/TestHostNetFramework/System.Xml.XmlDocument.dll +-./sdk/x.y.z/TestHostNetFramework/System.Xml.XmlSerializer.dll +-./sdk/x.y.z/TestHostNetFramework/System.Xml.XPath.dll +-./sdk/x.y.z/TestHostNetFramework/System.Xml.XPath.XDocument.dll +-./sdk/x.y.z/TestHostNetFramework/testhost.arm64.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.arm64.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net47.arm64.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net47.arm64.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net47.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net47.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net47.x86.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net47.x86.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net471.arm64.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net471.arm64.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net471.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net471.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net471.x86.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net471.x86.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net472.arm64.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net472.arm64.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net472.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net472.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net472.x86.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net472.x86.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net48.arm64.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net48.arm64.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net48.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net48.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.net48.x86.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.net48.x86.exe.config +-./sdk/x.y.z/TestHostNetFramework/testhost.x86.exe +-./sdk/x.y.z/TestHostNetFramework/testhost.x86.exe.config +-./sdk/x.y.z/TestHostNetFramework/tr/ +-./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/x64/ +-./sdk/x.y.z/TestHostNetFramework/x64/msdia140.dll +-./sdk/x.y.z/TestHostNetFramework/x64/msdia140.dll.manifest +-./sdk/x.y.z/TestHostNetFramework/x86/ +-./sdk/x.y.z/TestHostNetFramework/x86/msdia140.dll +-./sdk/x.y.z/TestHostNetFramework/x86/msdia140.dll.manifest +-./sdk/x.y.z/TestHostNetFramework/zh-Hans/ +-./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hant/ +-./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +./sdk/x.y.z/testhost.dll.config +./sdk/x.y.z/testhost.runtimeconfig.json +./sdk/x.y.z/testhost.x86 @@ -1160,157 +1656,16 @@ index ------------ +./sdk/x.y.z/testhost.x86.dll +./sdk/x.y.z/testhost.x86.dll.config +./sdk/x.y.z/testhost.x86.runtimeconfig.json - ./sdk/x.y.z/TestHost/ --./sdk/x.y.z/TestHost/cs/ --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/datacollector.exe --./sdk/x.y.z/TestHost/datacollector.exe.config --./sdk/x.y.z/TestHost/de/ --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/es/ --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/fr/ --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/it/ --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/ja/ --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/ko/ --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CommunicationUtilities.dll - ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CoreUtilities.dll - ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CrossPlatEngine.dll -@@ ------------ @@ - ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.Utilities.dll - ./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.Common.dll - ./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll --./sdk/x.y.z/TestHost/msdia140typelib_clr0200.dll - ./sdk/x.y.z/TestHost/Newtonsoft.Json.dll - ./sdk/x.y.z/TestHost/NuGet.Frameworks.dll --./sdk/x.y.z/TestHost/pl/ --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/pt-BR/ --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/ru/ --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/System.Collections.Immutable.dll --./sdk/x.y.z/TestHost/System.Reflection.Metadata.dll --./sdk/x.y.z/TestHost/testhost.exe --./sdk/x.y.z/TestHost/testhost.exe.config --./sdk/x.y.z/TestHost/testhost.net452.exe --./sdk/x.y.z/TestHost/testhost.net452.exe.config --./sdk/x.y.z/TestHost/testhost.net452.x86.exe --./sdk/x.y.z/TestHost/testhost.net452.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net46.exe --./sdk/x.y.z/TestHost/testhost.net46.exe.config --./sdk/x.y.z/TestHost/testhost.net46.x86.exe --./sdk/x.y.z/TestHost/testhost.net46.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net461.exe --./sdk/x.y.z/TestHost/testhost.net461.exe.config --./sdk/x.y.z/TestHost/testhost.net461.x86.exe --./sdk/x.y.z/TestHost/testhost.net461.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net462.exe --./sdk/x.y.z/TestHost/testhost.net462.exe.config --./sdk/x.y.z/TestHost/testhost.net462.x86.exe --./sdk/x.y.z/TestHost/testhost.net462.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net47.exe --./sdk/x.y.z/TestHost/testhost.net47.exe.config --./sdk/x.y.z/TestHost/testhost.net47.x86.exe --./sdk/x.y.z/TestHost/testhost.net47.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net471.exe --./sdk/x.y.z/TestHost/testhost.net471.exe.config --./sdk/x.y.z/TestHost/testhost.net471.x86.exe --./sdk/x.y.z/TestHost/testhost.net471.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net472.exe --./sdk/x.y.z/TestHost/testhost.net472.exe.config --./sdk/x.y.z/TestHost/testhost.net472.x86.exe --./sdk/x.y.z/TestHost/testhost.net472.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net48.exe --./sdk/x.y.z/TestHost/testhost.net48.exe.config --./sdk/x.y.z/TestHost/testhost.net48.x86.exe --./sdk/x.y.z/TestHost/testhost.net48.x86.exe.config --./sdk/x.y.z/TestHost/testhost.x86.exe --./sdk/x.y.z/TestHost/testhost.x86.exe.config --./sdk/x.y.z/TestHost/tr/ --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/x64/ --./sdk/x.y.z/TestHost/x64/msdia140.dll --./sdk/x.y.z/TestHost/x64/msdia140.dll.manifest --./sdk/x.y.z/TestHost/x86/ --./sdk/x.y.z/TestHost/x86/msdia140.dll --./sdk/x.y.z/TestHost/x86/msdia140.dll.manifest --./sdk/x.y.z/TestHost/zh-Hans/ --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/ --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -+./sdk/x.y.z/TestHost/ref/ -+./sdk/x.y.z/TestHost/ref/testhost.dll -+./sdk/x.y.z/TestHost/ref/testhost.x86.dll ++./sdk/x.y.z/TestHost/ ++./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CommunicationUtilities.dll ++./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CoreUtilities.dll ++./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CrossPlatEngine.dll ++./sdk/x.y.z/TestHost/Microsoft.TestPlatform.PlatformAbstractions.dll ++./sdk/x.y.z/TestHost/Microsoft.TestPlatform.Utilities.dll ++./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.Common.dll ++./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll ++./sdk/x.y.z/TestHost/Newtonsoft.Json.dll ++./sdk/x.y.z/TestHost/NuGet.Frameworks.dll +./sdk/x.y.z/TestHost/testhost.deps.json +./sdk/x.y.z/TestHost/testhost.dll +./sdk/x.y.z/TestHost/testhost.dll.config @@ -1326,6 +1681,10 @@ index ------------ ./sdk/x.y.z/tr/Microsoft.Build.resources.dll ./sdk/x.y.z/tr/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/tr/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/tr/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/tr/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -1336,7 +1695,6 @@ index ------------ -./sdk/x.y.z/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/tr/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/tr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -1361,18 +1719,28 @@ index ------------ -./sdk/x.y.z/tr/NuGet.Versioning.resources.dll -./sdk/x.y.z/tr/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/tr/System.CommandLine.resources.dll +-./sdk/x.y.z/tr/Test.Utility.resources.dll -./sdk/x.y.z/tr/vstest.console.resources.dll + ./sdk/x.y.z/trustedroots/ + ./sdk/x.y.z/trustedroots/codesignctl.pem +./sdk/x.y.z/vstest.console ./sdk/x.y.z/vstest.console.deps.json ./sdk/x.y.z/vstest.console.dll ./sdk/x.y.z/vstest.console.dll.config +-./sdk/x.y.z/vstest.console.exe ./sdk/x.y.z/vstest.console.runtimeconfig.json +-./sdk/x.y.z/x64/ +-./sdk/x.y.z/x64/dbghelp.dll ./sdk/x.y.z/zh-Hans/ ./sdk/x.y.z/zh-Hans/dotnet.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.Build.NuGetSdkResolver.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.Build.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -1383,7 +1751,6 @@ index ------------ -./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -1408,6 +1775,7 @@ index ------------ -./sdk/x.y.z/zh-Hans/NuGet.Versioning.resources.dll -./sdk/x.y.z/zh-Hans/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll +-./sdk/x.y.z/zh-Hans/Test.Utility.resources.dll -./sdk/x.y.z/zh-Hans/vstest.console.resources.dll ./sdk/x.y.z/zh-Hant/ ./sdk/x.y.z/zh-Hant/dotnet.resources.dll @@ -1415,6 +1783,10 @@ index ------------ ./sdk/x.y.z/zh-Hant/Microsoft.Build.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.Build.Tasks.Core.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.Build.Utilities.Core.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.CodeCoverage.IO.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.Deployment.DotNet.Releases.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Sln.Internal.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll @@ -1425,7 +1797,6 @@ index ------------ -./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.Coverage.IO.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Client.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll @@ -1450,24 +1821,8 @@ index ------------ -./sdk/x.y.z/zh-Hant/NuGet.Versioning.resources.dll -./sdk/x.y.z/zh-Hant/NuGet.VisualStudio.Contracts.resources.dll ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll +-./sdk/x.y.z/zh-Hant/Test.Utility.resources.dll -./sdk/x.y.z/zh-Hant/vstest.console.resources.dll ./shared/ ./shared/Microsoft.AspNetCore.App/ - ./shared/Microsoft.AspNetCore.App/x.y.z/ -@@ ------------ @@ - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Extensions.WebEncoders.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.JSInterop.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Net.Http.Headers.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.DiagnosticSource.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.EventLog.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Formats.Asn1.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.IO.Pipelines.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Runtime.CompilerServices.Unsafe.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.AccessControl.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Pkcs.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Xml.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Encodings.Web.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Json.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/THIRD-PARTY-NOTICES.txt - ./shared/Microsoft.NETCore.App/ - ./shared/Microsoft.NETCore.App/x.y.z/ \ No newline at end of file + ./shared/Microsoft.AspNetCore.App/x.y.z/ \ No newline at end of file From c5720d617f67c5833ac21492e9a4665074cc34a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 19:34:38 +0000 Subject: [PATCH 57/62] Update dependencies from https://github.com/dotnet/sdk build 20220927.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22469.9 -> To Version 7.0.100-rtm.22477.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22464.4 -> To Version 7.0.0-rtm.22476.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de9098596..211eca667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 - + https://github.com/dotnet/aspnetcore - a81424175e994a8f0253a333db279758b6940742 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - a81424175e994a8f0253a333db279758b6940742 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - a81424175e994a8f0253a333db279758b6940742 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - a81424175e994a8f0253a333db279758b6940742 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - a81424175e994a8f0253a333db279758b6940742 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - a81424175e994a8f0253a333db279758b6940742 + 931abe3925027a098bddb6174e05e1d9ea6322a4 - + https://github.com/dotnet/aspnetcore - a81424175e994a8f0253a333db279758b6940742 + 931abe3925027a098bddb6174e05e1d9ea6322a4 https://github.com/dotnet/test-templates @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 36742fd0c72f329123105b0cceefbe8ed8e48782 + 51c0a5abb19c55895885ca704f72bb8cfab9a54a - + https://github.com/dotnet/sdk - 36742fd0c72f329123105b0cceefbe8ed8e48782 + 51c0a5abb19c55895885ca704f72bb8cfab9a54a - + https://github.com/dotnet/sdk - 36742fd0c72f329123105b0cceefbe8ed8e48782 + 51c0a5abb19c55895885ca704f72bb8cfab9a54a - + https://github.com/dotnet/sdk - 36742fd0c72f329123105b0cceefbe8ed8e48782 + 51c0a5abb19c55895885ca704f72bb8cfab9a54a @@ -129,13 +129,13 @@ https://github.com/dotnet/wpf a956caa0747c27f0b0776d845fafe0b05b2c7337 - + https://github.com/dotnet/fsharp - 4c4c3894bb118332e036ad99fcff1de89d6af307 + 7669e0a6dbeb872512c073c49c7661a71cfb6e07 - + https://github.com/dotnet/fsharp - 4c4c3894bb118332e036ad99fcff1de89d6af307 + 7669e0a6dbeb872512c073c49c7661a71cfb6e07 diff --git a/eng/Versions.props b/eng/Versions.props index b8a438cbe..ddb741270 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,22 +50,22 @@ - 7.0.0-rtm.22476.23 - 7.0.0-rtm.22476.23 - 7.0.0-rtm.22476.23 - 7.0.0-rtm.22476.23 - 7.0.0-rtm.22476.23 - 7.0.0-rtm.22476.23 - 7.0.0-rtm.22476.23 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 + 7.0.0-rtm.22477.1 0.2.0 - 7.0.100-rtm.22477.6 - 7.0.100-rtm.22477.6 - 7.0.100-rtm.22477.6 + 7.0.100-rtm.22477.9 + 7.0.100-rtm.22477.9 + 7.0.100-rtm.22477.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0d0e4c0ecb56639da3808baa88a6c72da120e31 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 27 Sep 2022 19:52:07 +0000 Subject: [PATCH 58/62] Remove backported source-build patches --- ...slynAnalyzer-Microsoft.CodeAnalysis..patch | 25 -- ...001-Change-TargetFramework-to-net7.0.patch | 313 ------------------ 2 files changed, 338 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch delete mode 100644 src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch diff --git a/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch b/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch deleted file mode 100644 index d9bae526a..000000000 --- a/src/SourceBuild/tarball/patches/linker/0002-Update-ILLink.RoslynAnalyzer-Microsoft.CodeAnalysis..patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 12 Aug 2022 20:58:39 +0000 -Subject: [PATCH] Update ILLink.RoslynAnalyzer Microsoft.CodeAnalysis.CSharp - reference for source-build - -backport: https://github.com/dotnet/linker/pull/3045 ---- - src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj b/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj -index cafde32b..a5f450a3 100644 ---- a/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj -+++ b/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj -@@ -17,7 +17,8 @@ - - - -- -+ -+ - - all - contentfiles diff --git a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch deleted file mode 100644 index 660d2c914..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch +++ /dev/null @@ -1,313 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ben Villalobos <4691428+BenVillalobos@users.noreply.github.com> -Date: Tue, 5 Jul 2022 16:33:56 -0500 -Subject: [PATCH] Change TargetFramework to net7.0 - -Add nowarn for SYSLIB warnings -Resolve CS8981: lowercase preserved types - -Backport PR: https://github.com/dotnet/msbuild/pull/7790 ---- - Directory.Build.props | 2 +- - eng/BootStrapMSBuild.targets | 2 +- - eng/cibuild_bootstrapped_msbuild.ps1 | 2 +- - eng/cibuild_bootstrapped_msbuild.sh | 2 +- - global.json | 2 +- - scripts/Deploy-MSBuild.ps1 | 2 +- - .../RemoteProjectsProviderMock/CollectionsHelpers.cs | 8 ++++---- - .../Microsoft.Build.Engine.UnitTests.csproj | 4 ++-- - src/Build/Definition/ToolsetReader.cs | 4 ++-- - src/Build/Microsoft.Build.csproj | 2 +- - src/Directory.BeforeCommon.targets | 2 +- - src/Directory.Build.props | 6 +++--- - src/Framework/README.md | 2 +- - src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj | 2 +- - src/Package/Localization/Localization.csproj | 2 +- - src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj | 4 ++-- - src/Tasks/Microsoft.Build.Tasks.csproj | 2 +- - src/Utilities/README.md | 2 +- - 18 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 0df28a5b8..3a959f894 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -38,7 +38,7 @@ - SYSLIB0011: Removing binary formatter will happen as part of a larger .NET-wide effort. - --> - -- $(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011 -+ $(NoWarn);NU1603;NU5105;1701;1702;SYSLIB0011;SYSLIB0037;SYSLIB0044 - - - -diff --git a/eng/BootStrapMSBuild.targets b/eng/BootStrapMSBuild.targets -index 288c062da..4ba21444d 100644 ---- a/eng/BootStrapMSBuild.targets -+++ b/eng/BootStrapMSBuild.targets -@@ -210,7 +210,7 @@ - Copy it from "next to MSBuild" in the pre-bootstrap SDK to our little weirdo bootstrap - layout next to the SDK tasks, so it can get loaded by the SDK tasks that need it. --> - -+ DestinationFolder="$(BootstrapDestination)Sdks\Microsoft.NET.Sdk\tools\net7.0" /> - - -diff --git a/eng/cibuild_bootstrapped_msbuild.ps1 b/eng/cibuild_bootstrapped_msbuild.ps1 -index b9c1cf4fe..906a33dc1 100644 ---- a/eng/cibuild_bootstrapped_msbuild.ps1 -+++ b/eng/cibuild_bootstrapped_msbuild.ps1 -@@ -91,7 +91,7 @@ try { - else - { - $buildToolPath = $dotnetExePath -- $buildToolCommand = Join-Path $bootstrapRoot "net6.0\MSBuild\MSBuild.dll" -+ $buildToolCommand = Join-Path $bootstrapRoot "net7.0\MSBuild\MSBuild.dll" - $buildToolFramework = "netcoreapp3.1" - } - -diff --git a/eng/cibuild_bootstrapped_msbuild.sh b/eng/cibuild_bootstrapped_msbuild.sh -index e5425507f..b4404b7e4 100755 ---- a/eng/cibuild_bootstrapped_msbuild.sh -+++ b/eng/cibuild_bootstrapped_msbuild.sh -@@ -63,7 +63,7 @@ bootstrapRoot="$Stage1Dir/bin/bootstrap" - if [ $host_type = "core" ] - then - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" -- _InitializeBuildToolCommand="$bootstrapRoot/net6.0/MSBuild/MSBuild.dll" -+ _InitializeBuildToolCommand="$bootstrapRoot/net7.0/MSBuild/MSBuild.dll" - _InitializeBuildToolFramework="netcoreapp3.1" - elif [ $host_type = "mono" ] - then -diff --git a/global.json b/global.json -index 471f88dbc..efd25efd1 100644 ---- a/global.json -+++ b/global.json -@@ -3,7 +3,7 @@ - "allowPrerelease": true - }, - "tools": { -- "dotnet": "6.0.401", -+ "dotnet": "7.0.100-preview.5.22307.18", - "vs": { - "version": "17.2.1" - }, -diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1 -index ef1959fc3..8cfecb6a0 100644 ---- a/scripts/Deploy-MSBuild.ps1 -+++ b/scripts/Deploy-MSBuild.ps1 -@@ -69,7 +69,7 @@ else { - if ($runtime -eq "Desktop") { - $targetFramework = "net472" - } else { -- $targetFramework = "net6.0" -+ $targetFramework = "net7.0" - } - - $bootstrapBinDirectory = "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework" -diff --git a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs -index b6d935f41..83035cd50 100644 ---- a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs -+++ b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/CollectionsHelpers.cs -@@ -85,13 +85,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting - } - - -- public static IDictionary ImportDictionary(this ProjectCollectionLinker importer, IDictionary source) -+ public static IDictionary ImportDictionary(this ProjectCollectionLinker importer, IDictionary source) - where T : class - where RMock : MockLinkRemoter, new() - { - if (source == null) return null; - // Just copy ... -- Dictionary result = new Dictionary(); -+ Dictionary result = new Dictionary(); - foreach (var sRemoter in source) - { - var value = importer.Import(sRemoter.Value); -@@ -101,13 +101,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting - return result; - } - -- public static IDictionary ExportDictionary(this ProjectCollectionLinker exporter, IDictionary source) -+ public static IDictionary ExportDictionary(this ProjectCollectionLinker exporter, IDictionary source) - where T : class - where RMock : MockLinkRemoter, new() - { - if (source == null) return null; - // Just copy ... -- Dictionary result = new Dictionary(); -+ Dictionary result = new Dictionary(); - foreach (var s in source) - { - var valueRemoter = exporter.Export(s.Value); -diff --git a/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj b/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj -index 8ddca6108..83a4382d8 100644 ---- a/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj -+++ b/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj -@@ -36,14 +36,14 @@ - - TargetFramework=$(FullFrameworkTFM) - TargetFramework=$(FullFrameworkTFM) -- TargetFramework=net6.0 -+ TargetFramework=net7.0 - - - - - TargetFramework=$(FullFrameworkTFM) - TargetFramework=$(FullFrameworkTFM) -- TargetFramework=net6.0 -+ TargetFramework=net7.0 - - - -diff --git a/src/Build/Definition/ToolsetReader.cs b/src/Build/Definition/ToolsetReader.cs -index 8887b9cca..ddb164cb7 100644 ---- a/src/Build/Definition/ToolsetReader.cs -+++ b/src/Build/Definition/ToolsetReader.cs -@@ -12,7 +12,7 @@ using Microsoft.Build.Execution; - using Microsoft.Build.Framework; - using Microsoft.Build.Internal; - using Microsoft.Build.Shared.FileSystem; --using error = Microsoft.Build.Shared.ErrorUtilities; -+using ErrorUtils = Microsoft.Build.Shared.ErrorUtilities; - using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; - using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; - using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -@@ -366,7 +366,7 @@ namespace Microsoft.Build.Evaluation - out string defaultOverrideToolsVersion - ) - { -- error.VerifyThrowArgumentNull(toolsets, "Toolsets"); -+ ErrorUtils.VerifyThrowArgumentNull(toolsets, "Toolsets"); - - ReadEachToolset(toolsets, globalProperties, initialProperties, accumulateProperties); - -diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj -index 309d14bdc..c4eb0bce6 100644 ---- a/src/Build/Microsoft.Build.csproj -+++ b/src/Build/Microsoft.Build.csproj -@@ -4,7 +4,7 @@ - - - -- $(FullFrameworkTFM);net6.0 -+ $(FullFrameworkTFM);net7.0 - $(RuntimeOutputTargetFrameworks) - Microsoft.Build - Microsoft.Build -diff --git a/src/Directory.BeforeCommon.targets b/src/Directory.BeforeCommon.targets -index 6696e3861..40bc57ecb 100644 ---- a/src/Directory.BeforeCommon.targets -+++ b/src/Directory.BeforeCommon.targets -@@ -92,7 +92,7 @@ - $(DefineConstants);FEATURE_SYMLINK_TARGET - - -- -+ - $(DefineConstants);FEATURE_PIPEOPTIONS_CURRENTUSERONLY - $(DefineConstants);FEATURE_NODE_REUSE - -diff --git a/src/Directory.Build.props b/src/Directory.Build.props -index ccffd9b5c..6e12f1557 100644 ---- a/src/Directory.Build.props -+++ b/src/Directory.Build.props -@@ -30,13 +30,13 @@ - AnyCPU;x64;arm64 - - -- $(FullFrameworkTFM);net6.0;netstandard2.0 -- net6.0;netstandard2.0 -+ $(FullFrameworkTFM);net7.0;netstandard2.0 -+ net7.0;netstandard2.0 - $(FullFrameworkTFM);netstandard2.0 - AnyCPU - - -- net6.0 -+ net7.0 - $(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks) - $(FullFrameworkTFM) - -diff --git a/src/Framework/README.md b/src/Framework/README.md -index 1b72454f5..8a86bc21c 100644 ---- a/src/Framework/README.md -+++ b/src/Framework/README.md -@@ -6,6 +6,6 @@ The items in this namespace are primarily base-level classes and interfaces shar - [`ITask`](https://docs.microsoft.com/dotnet/api/microsoft.build.framework.itask), and [`ILogger`](https://docs.microsoft.com/dotnet/api/microsoft.build.framework.ilogger). - - ### netstandard2.0 target --The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net6.0` or `net472`. Please use the `net6.0`-targeted assemblies for .NET Core 6+ scenarios. -+The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net7.0` or `net472`. Please use the `net7.0`-targeted assemblies for .NET Core 6+ scenarios. - - For context, see https://github.com/dotnet/msbuild/pull/6148 -\ No newline at end of file -diff --git a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj -index 9bb2da049..4766c0418 100644 ---- a/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj -+++ b/src/MSBuild.Bootstrap/MSBuild.Bootstrap.csproj -@@ -43,7 +43,7 @@ - - - -- -+ - - - -diff --git a/src/Package/Localization/Localization.csproj b/src/Package/Localization/Localization.csproj -index e15af6ed0..e6c8a82ee 100644 ---- a/src/Package/Localization/Localization.csproj -+++ b/src/Package/Localization/Localization.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ net7.0 - net472 - Microsoft.Build.Localization.nuspec - false -diff --git a/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj b/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj -index 6972b5e9a..0e37d41d9 100644 ---- a/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj -+++ b/src/Samples/ProjectCachePlugin/ProjectCachePlugin.csproj -@@ -4,8 +4,8 @@ - false - false - -- net6.0 -- $(FullFrameworkTFM);net6.0 -+ net7.0 -+ $(FullFrameworkTFM);net7.0 - $(RuntimeOutputTargetFrameworks) - - -diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj -index 5bd98bfbe..547075939 100644 ---- a/src/Tasks/Microsoft.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.Build.Tasks.csproj -@@ -1013,7 +1013,7 @@ - - - -- -+ - - - -diff --git a/src/Utilities/README.md b/src/Utilities/README.md -index a85d56e11..99a1651b5 100644 ---- a/src/Utilities/README.md -+++ b/src/Utilities/README.md -@@ -7,6 +7,6 @@ This package contains `Microsoft.Build.Utilities.Core.dll`, which defines helper - * [`Logger`](https://docs.microsoft.com/dotnet/api/microsoft.build.utilities.logger), a base class for custom logging functionality. - - ### netstandard2.0 target --The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net6.0` or `net472`. Please use the `net6.0`-targeted assemblies for .NET Core 6+ scenarios. -+The `netstandard2.0` target of this build is configured only to output reference assemblies; at runtime MSBuild will be `net7.0` or `net472`. Please use the `net7.0`-targeted assemblies for .NET Core 6+ scenarios. - - For context, see https://github.com/dotnet/msbuild/pull/6148 -\ No newline at end of file From 4ea53e94447f692598f6cb1a7eb806caa54d08c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 20:51:38 +0000 Subject: [PATCH 59/62] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220927.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22472.3 -> To Version 7.0.0-alpha.1.22477.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 686570c21..41b14fcc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,9 +206,9 @@ https://github.com/dotnet/arcade 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/source-build-reference-packages - f23834cc527b7b88a3600ab8cd857eab93cca0a6 + cc5e59bb20d7d90cd4c373c3224a300d65fb693e From 7e218970d06d7563f3912c2363f74bd2ce0351d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 22:10:20 +0000 Subject: [PATCH 60/62] Update dependencies from https://github.com/dotnet/sdk build 20220927.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22469.9 -> To Version 7.0.100-rtm.22477.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22464.4 -> To Version 7.0.0-rtm.22476.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++++--------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 211eca667..b0656ce26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,30 +22,30 @@ 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/dotnet/runtime - 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 + 915dc2723565b176dfec058665c5f8ecc250479a @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 97faf12ea2955dbcdb6434f3fa0c7c9ea01e6323 + 915dc2723565b176dfec058665c5f8ecc250479a https://github.com/dotnet/aspnetcore @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - 51c0a5abb19c55895885ca704f72bb8cfab9a54a + efe49defc553aeb1df2d487d2f2cffea7218d5af - + https://github.com/dotnet/sdk - 51c0a5abb19c55895885ca704f72bb8cfab9a54a + efe49defc553aeb1df2d487d2f2cffea7218d5af - + https://github.com/dotnet/sdk - 51c0a5abb19c55895885ca704f72bb8cfab9a54a + efe49defc553aeb1df2d487d2f2cffea7218d5af - + https://github.com/dotnet/sdk - 51c0a5abb19c55895885ca704f72bb8cfab9a54a + efe49defc553aeb1df2d487d2f2cffea7218d5af @@ -154,9 +154,9 @@ 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - c7d758591e31a066212058d589759c580336deff + fcc47893800b67cb43c1bd53771426e701505abf @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6625add9a3eadc2954af0311be35290cfefcddb0 + 77c2667993976295017e2759f075550bcf606fc1 - + https://github.com/dotnet/emsdk - 6625add9a3eadc2954af0311be35290cfefcddb0 + 77c2667993976295017e2759f075550bcf606fc1 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index ddb741270..3faec6e24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,25 +63,25 @@ - 7.0.100-rtm.22477.9 - 7.0.100-rtm.22477.9 - 7.0.100-rtm.22477.9 + 7.0.100-rtm.22477.12 + 7.0.100-rtm.22477.12 + 7.0.100-rtm.22477.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.12 - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 + 7.0.0-rtm.22476.12 2.1.0 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.2.22465.1 - 7.0.0-rc.2.22465.1 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 9c273c2413c820e90038d54e30344761819a23ca Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Wed, 28 Sep 2022 02:50:43 +0000 Subject: [PATCH 61/62] Remove runtime patch --- ...-conflicting-runtime-and-roslyn-APIs.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch b/src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch deleted file mode 100644 index f88b9fdf3..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-Fully-qualify-conflicting-runtime-and-roslyn-APIs.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Thu, 14 Jul 2022 14:53:35 -0700 -Subject: [PATCH 3/5] Fully qualify conflicting runtime and roslyn APIs - ---- - .../System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs | 2 +- - .../System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs -index 43a498b589a..1bad8f3753c 100644 ---- a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs -+++ b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs -@@ -15,7 +15,7 @@ namespace Generators - { - public partial class EventSourceGenerator - { -- private static EventSourceClass? GetSemanticTargetForGeneration(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) -+ private static EventSourceClass? GetSemanticTargetForGeneration(Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) - { - const string EventSourceAttribute = "System.Diagnostics.Tracing.EventSourceAttribute"; - -diff --git a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs -index 7a472a994c9..36dc7500bea 100644 ---- a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs -+++ b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs -@@ -20,7 +20,7 @@ public partial class RegexGenerator - - // Returns null if nothing to do, Diagnostic if there's an error to report, or RegexType if the type was analyzed successfully. - private static object? GetSemanticTargetForGeneration( -- GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) -+ Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken) - { - var methodSyntax = (MethodDeclarationSyntax)context.TargetNode; - SemanticModel sm = context.SemanticModel; From 02b17725926528b89bf9b1ce6dbe0a5736450e3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 05:56:46 +0000 Subject: [PATCH 62/62] Update dependencies from https://github.com/dotnet/sdk build 20220927.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22477.12 -> To Version 7.0.100-rtm.22477.16 Dependency coherency updates NuGet.Build.Tasks From Version 6.4.0-preview.3.97 -> To Version 6.4.0-preview.3.100 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69f60b878..73c0d941f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - efe49defc553aeb1df2d487d2f2cffea7218d5af + f41d20c3c112f03114c873b0316b9cca5626f324 - + https://github.com/dotnet/sdk - efe49defc553aeb1df2d487d2f2cffea7218d5af + f41d20c3c112f03114c873b0316b9cca5626f324 - + https://github.com/dotnet/sdk - efe49defc553aeb1df2d487d2f2cffea7218d5af + f41d20c3c112f03114c873b0316b9cca5626f324 - + https://github.com/dotnet/sdk - efe49defc553aeb1df2d487d2f2cffea7218d5af + f41d20c3c112f03114c873b0316b9cca5626f324 @@ -159,9 +159,9 @@ fcc47893800b67cb43c1bd53771426e701505abf - + https://github.com/nuget/nuget.client - cf1e6b6fd314fc510d1b64feed6b10515c202bec + 451713c59f5206f77c97d093dd5191be13f9d0e0 diff --git a/eng/Versions.props b/eng/Versions.props index 3faec6e24..0e8e97a2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22477.12 - 7.0.100-rtm.22477.12 - 7.0.100-rtm.22477.12 + 7.0.100-rtm.22477.16 + 7.0.100-rtm.22477.16 + 7.0.100-rtm.22477.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)