From 691dace92cc6e763f0dd60614e0070e61f293a7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Mar 2022 00:17:00 +0000 Subject: [PATCH 001/188] Update dependencies from https://github.com/dotnet/arcade build 20220222.7 (#6201) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 - eng/Version.Details.xml | 20 ++++----- eng/Versions.props | 8 ++-- eng/common/generate-sbom-prep.ps1 | 19 +++++++++ eng/common/generate-sbom-prep.sh | 22 ++++++++++ eng/common/templates/job/job.yml | 10 +++++ eng/common/templates/jobs/jobs.yml | 4 -- eng/common/templates/steps/generate-sbom.yml | 44 ++++++++++++++++++++ global.json | 4 +- 9 files changed, 110 insertions(+), 23 deletions(-) create mode 100644 eng/common/generate-sbom-prep.ps1 create mode 100644 eng/common/generate-sbom-prep.sh create mode 100644 eng/common/templates/steps/generate-sbom.yml diff --git a/NuGet.config b/NuGet.config index 56c6c42245f..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7be6e86f76..555bb6a1fd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f diff --git a/eng/Versions.props b/eng/Versions.props index 1a8ad8c0d09..75ffb45898d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,6 @@ 0 4 $(MajorVersion).$(MinorVersion).$(PatchVersion) - $(MajorVersion).$(MinorVersion).2.0 - servicing @@ -58,9 +56,9 @@ - 6.0.0-beta.22107.2 - 6.0.0-beta.22107.2 - 6.0.0-beta.22107.2 + 6.0.0-beta.22122.7 + 6.0.0-beta.22122.7 + 6.0.0-beta.22122.7 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 new file mode 100644 index 00000000000..a733a888582 --- /dev/null +++ b/eng/common/generate-sbom-prep.ps1 @@ -0,0 +1,19 @@ +Param( + [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed +) + +Write-Host "Creating dir $ManifestDirPath" +# create directory for sbom manifest to be placed +if (!(Test-Path -path $ManifestDirPath)) +{ + New-Item -ItemType Directory -path $ManifestDirPath + Write-Host "Successfully created directory $ManifestDirPath" +} +else{ + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +} + +Write-Host "Updating artifact name" +$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' +Write-Host "Artifact name $artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh new file mode 100644 index 00000000000..f6c77453142 --- /dev/null +++ b/eng/common/generate-sbom-prep.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +manifest_dir=$1 + +if [ ! -d "$manifest_dir" ] ; then + mkdir -p "$manifest_dir" + echo "Sbom directory created." $manifest_dir +else + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +fi + +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +echo "Artifact name before : "$artifact_name +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" +echo "Artifact name after : "$safe_artifact_name +export ARTIFACT_NAME=$safe_artifact_name +echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" + +exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 30d1de5835e..547d878da07 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -31,6 +31,10 @@ parameters: name: '' preSteps: [] runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' jobs: - job: ${{ parameters.name }} @@ -247,3 +251,9 @@ jobs: ArtifactName: AssetManifests continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 70d44735ace..554e71cfc43 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -8,10 +8,6 @@ parameters: # Optional: Enable publishing using release pipelines enablePublishUsingPipelines: false - # Optional: Disable component governance detection. In general, component governance - # should be on for all jobs. Use only in the event of issues. - disableComponentGovernance: false - # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml new file mode 100644 index 00000000000..f4d7937f379 --- /dev/null +++ b/eng/common/templates/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed + +parameters: + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + +- task: PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/global.json b/global.json index f6a510077e1..77aaba473f9 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7" }, "sdk": { "version": "6.0.101" From cbd1f2d0212d65569947590939c1db942689af1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Mar 2022 11:17:40 +1100 Subject: [PATCH 002/188] [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int (#6203) --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 555bb6a1fd7..064ee895314 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3a25a7f1cc446b60678ed25c9d829420d6321eba - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 962ab77e3d043ec9377feec32e1b26824338e9db + 69a705c88628eeb3bb2b3d5f9e337187465c6410 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 75ffb45898d..3c9d10953b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22104.2 + 6.0.0-rtm.22153.2 From 5e811c8e3ecbcd583f520da6a21547b6588e6947 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 9 Mar 2022 02:42:44 -0800 Subject: [PATCH 003/188] Merging internal commits for release/6.0 (#6228) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms) - Source msrc from internal * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms) * Merged PR 20942: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220214.7 - **Date Produced**: February 15, 2022 6:38:20 AM UTC - **Commit**: 553b0d1a8c7bf45cc27282ff8afbe20f697a6601 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22114.7][9] - **Microsoft.Private.Winforms**: [from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22114.7][9] - **Microsoft.NETCore.ILDAsm**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10] - **Microsoft.NETCore.ILAsm**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10] - **Microsoft.NETCore.App.Ref**: [from 6.0.2 to 6.0.1][10] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.2 to 6.0.1][10] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10] [9]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC5ad241b&targetVersion=GC553b0d1&_a=files [10]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC839cdfb&targetVersion=GC3a25a7f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.NETCore.ILDAsm**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.2 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.2 to 6.0.1 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.3 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.3 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms) * Merged PR 21411: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220223.7 - **Date Produced**: February 24, 2022 7:45:12 AM UTC - **Commit**: 1f426c90a9589dabc16d114aa91bfea9f21f8571 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][2] - **Microsoft.Private.Winforms**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][2] - **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.2][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.3 to 6.0.3][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCba13948&targetVersion=GC1f426c9&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC10db735&targetVersion=GCc24d9a9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) * Update NuGet.config Co-authored-by: DotNet Bot Co-authored-by: dotnet-bot Co-authored-by: Ashish Kumar Singh --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 064ee895314..d96feb70e4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ad241b9633924db40503de19cb502bb0aca7718 + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ad241b9633924db40503de19cb502bb0aca7718 + 1f426c90a9589dabc16d114aa91bfea9f21f8571 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 diff --git a/eng/Versions.props b/eng/Versions.props index 3c9d10953b1..8ce533b9796 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.2-servicing.22064.7 + 6.0.3-servicing.22123.7 5.0.0-alpha1.19562.1 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 + 6.0.3-servicing.22123.9 + 6.0.3-servicing.22123.9 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 - 6.0.1 + 6.0.3-servicing.22123.9 + 6.0.3 + 6.0.3 + 6.0.2 6.0.0 6.0.0 6.0.0 From ed7fe427629029551d483dfdc4dc3ff5ee36decf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 10:02:47 +0530 Subject: [PATCH 004/188] [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int (#6241) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220310.2 Microsoft.DotNet.Wpf.DncEng From Version 6.0.0-rtm.22153.2 -> To Version 6.0.0-rtm.22160.2 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220311.2 Microsoft.DotNet.Wpf.DncEng From Version 6.0.0-rtm.22153.2 -> To Version 6.0.0-rtm.22161.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d96feb70e4a..1e20a6faa59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 69a705c88628eeb3bb2b3d5f9e337187465c6410 + c8d46e6b93f648dd15d27210af19b62f98205daa https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8ce533b9796..a539beda995 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22153.2 + 6.0.0-rtm.22161.2 From eb52de69ef44b4820e88ab7468f8b04a703b3b21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Mar 2022 07:46:21 +0530 Subject: [PATCH 005/188] [release/6.0] Update dependencies from dotnet/arcade (#6240) * Update dependencies from https://github.com/dotnet/arcade build 20220309.8 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8 * Update dependencies from https://github.com/dotnet/arcade build 20220311.1 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22161.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++--- eng/Versions.props | 6 +- eng/common/templates/job/execute-sdl.yml | 69 +++---------------- eng/common/templates/jobs/codeql-build.yml | 2 +- eng/common/templates/steps/execute-sdl.yml | 68 ++++++++++++++++++ .../templates/variables/sdl-variables.yml | 7 ++ global.json | 8 +-- 7 files changed, 102 insertions(+), 78 deletions(-) create mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e20a6faa59..b81d707f706 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 diff --git a/eng/Versions.props b/eng/Versions.props index a539beda995..f15d79ee7e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22122.7 - 6.0.0-beta.22122.7 - 6.0.0-beta.22122.7 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index d0a1ea8b0f2..24cec0424e5 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -43,14 +43,9 @@ jobs: value: ${{ parameters.AzDOPipelineId }} - name: AzDOBuildId value: ${{ parameters.AzDOBuildId }} - # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in - # sync with the packages.config file. - - name: DefaultGuardianVersion - value: 0.110.1 + - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -126,57 +121,11 @@ jobs: displayName: Extract Archive Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages - - - ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - - - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() + - template: /eng/common/templates/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: ${{ parameters.additionalParameters }} + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml index f7dc5ea4aaa..54c393af440 100644 --- a/eng/common/templates/jobs/codeql-build.yml +++ b/eng/common/templates/jobs/codeql-build.yml @@ -21,7 +21,7 @@ jobs: # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in # sync with the packages.config file. - name: DefaultGuardianVersion - value: 0.109.0 + value: 0.110.1 - name: GuardianPackagesConfigFile value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - name: GuardianVersion diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml new file mode 100644 index 00000000000..7b8ee18a28d --- /dev/null +++ b/eng/common/templates/steps/execute-sdl.yml @@ -0,0 +1,68 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - powershell: | + $content = Get-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content was:`n$content" + + $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') + $content | Set-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content updated to:`n$content" + displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- task: NuGetCommand@2 + displayName: 'Install Guardian' + inputs: + restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config + externalFeedCredentials: GuardianConnect + restoreDirectory: $(Build.SourcesDirectory)\.packages + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml new file mode 100644 index 00000000000..1a860bd0406 --- /dev/null +++ b/eng/common/templates/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.110.1 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index 77aaba473f9..0853117f84b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.101", + "dotnet": "6.0.103", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22161.1" }, "sdk": { - "version": "6.0.101" + "version": "6.0.103" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 2aec75adbfd29c5f483434994700ded8ff92d85d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 22:46:28 +0000 Subject: [PATCH 006/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220405.6 (#6367) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b81d707f706..092fff8be35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - c8d46e6b93f648dd15d27210af19b62f98205daa + 12fb1d1bf394066a31a76f68a6eca02a6fc56b91 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f15d79ee7e7..4319f045147 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22161.2 + 6.0.0-rtm.22205.6 From a205a8c2031a7a6a52391b6538ce672660a6c60a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 03:38:32 +0000 Subject: [PATCH 007/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220405.9 (#6368) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 092fff8be35..aac1eb079bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 12fb1d1bf394066a31a76f68a6eca02a6fc56b91 diff --git a/eng/Versions.props b/eng/Versions.props index 4319f045147..1d70d5ec408 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22205.6 + 6.0.0-rtm.22205.9 From 9bc3cf3127cf8a16f732a512828cea362cf1a06c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 04:50:38 +0000 Subject: [PATCH 008/188] Update dependencies from https://github.com/dotnet/arcade build 20220328.5 (#6365) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/templates/steps/source-build.yml | 4 ++-- global.json | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aac1eb079bc..e8e2e56791e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 - + https://github.com/dotnet/arcade - 879df783283dfb44c7653493fdf7fd7b07ba6b01 + f8c0d51185208227e582f76ac3c5003db237b689 diff --git a/eng/Versions.props b/eng/Versions.props index 1d70d5ec408..34a086cc329 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 - 6.0.0-beta.22161.1 + 6.0.0-beta.22178.5 + 6.0.0-beta.22178.5 + 6.0.0-beta.22178.5 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ba40dc82f14..abb1b2bcda4 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 0853117f84b..dfdb062a366 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22161.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22178.5" }, "sdk": { "version": "6.0.103" From 636bc566bf1852e2f0f94f3ae13f8629bdfeae10 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 5 Apr 2022 21:51:55 -0700 Subject: [PATCH 009/188] Update branding to 6.0.5 (#6362) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 34a086cc329..f9d63a9cd4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 4 + 5 $(MajorVersion).$(MinorVersion).$(PatchVersion) - 6.0.0-beta.22178.5 - 6.0.0-beta.22178.5 - 6.0.0-beta.22178.5 + 6.0.0-beta.22206.7 + 6.0.0-beta.22206.7 + 6.0.0-beta.22206.7 diff --git a/global.json b/global.json index dfdb062a366..ecbcf88dcda 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22178.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22206.7" }, "sdk": { "version": "6.0.103" From e5f070ea8e541505a100b89eb6c740c833cb4c1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 17:27:07 +0000 Subject: [PATCH 011/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220407.2 (#6381) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a98efe1b5bc..eafea1321e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 12fb1d1bf394066a31a76f68a6eca02a6fc56b91 + 88ff411715df6da3c1e6c789496f83042b470d3a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8fd611499ed..32cef80367b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22205.9 + 6.0.0-rtm.22207.2 From 1de1b78d3230659d6a9188aed53044e8214043de Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Fri, 8 Apr 2022 10:48:45 +0530 Subject: [PATCH 012/188] use unscaled mouse coordintes for convex hull test (#6332) (#6370) Co-authored-by: Sam Bent --- .../Windows/Controls/PopupControlService.cs | 79 +++++++++++-------- 1 file changed, 48 insertions(+), 31 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs index c60b7d19fcf..b39aea2cb2c 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs @@ -1558,39 +1558,56 @@ private void AddPoints(PointList points, in NativeMethods.RECT rect, bool rectIs // Test whether the current mouse point lies within the convex hull internal bool ContainsMousePoint() { - IInputElement rootElement = _source.RootVisual as IInputElement; - if (rootElement != null) + // get the coordinates of the current mouse point, relative to the Active source + PresentationSource mouseSource = Mouse.PrimaryDevice.CriticalActiveSource; + System.Windows.Point pt = Mouse.PrimaryDevice.NonRelativePosition; + + // translate the point to our source's coordinates, if necessary + // (e.g. if the tooltip's owner comes from a window with capture, + // such as the popup of a ComboBox) + if (mouseSource != _source) { - // get the coordinates of the current mouse point, relative to our PresentationSource - System.Windows.Point pt = Mouse.PrimaryDevice.GetPosition(rootElement); - - // check whether the point lies within the hull - return ContainsPoint(_source, (int)pt.X, (int)pt.Y); - - // NOTE: GetPosition doesn't actually return the position of the current mouse point, - // but rather the last recorded position. (See MouseDevice.GetScreenPositionFromSystem, - // which says that "Win32 has issues reliably returning where the mouse is".) - // This causes a small problem when (a) the PresentationSource has capture, e.g. - // the popup of a ComboBox, and (b) the mouse moves to a position that lies outside both the - // capturing PresentationSource (popup window) and the input-providing PresentationSource - // (main window). The MouseDevice only records positions within the input-providing - // PresentationSource, so we'll test the position where the mouse left the main window, - // rather than the current position. - // This means we may leave a tooltip open even when the mouse leaves its SafeArea, - // but only when the tooltip belongs to a capturing source, and the "leaving the SafeArea" - // action occurs outside the surrounding main window. For our example, it can happen - // when the ComboBox is close to the edge of the main window so that a tooltip from its - // popup content extends beyond the main window. - // This can only be fixed by changing MouseDevice.GetScreenPositionFromSystem to - // use a "better way" to find the current mouse position, which allegedly needs work from the OS. - // But we can live with this behavior, because - // * this is a corner case - tooltips from popup content that extend beyond the main window - // * the effect is transient - the tooltip will close when the user dismisses the popup - // * there's no accessibility issue - WCAG 2.1 only requires that the tooltip stays open under - // proscribed conditions, not that it has to close when the conditions cease to apply + System.Windows.Point ptScreen = PointUtil.ClientToScreen(pt, mouseSource); + pt = PointUtil.ScreenToClient(ptScreen, _source); } - else - return false; + + #if DEBUG + // NonRelativePosition returns the mouse point in unscaled screen coords, relative + // to the active window's client area (despite the name). + // Compute the point a different way, and check that it agrees. The second + // way uses public API, but in our case ends up doing a lot of transforms + // and multiplications that should simply cancel each other out. + System.Windows.Interop.HwndSource hwndSource = _source as System.Windows.Interop.HwndSource; + IInputElement rootElement = hwndSource?.RootVisual as IInputElement; + Debug.Assert(hwndSource != null && rootElement != null, "expect non-null hwndSource and rootElement"); + System.Windows.Point pt2 = hwndSource.TransformToDevice(Mouse.PrimaryDevice.GetPosition(rootElement)); + Debug.Assert(((int)pt.X == (int)Math.Round(pt2.X)) && ((int)pt.Y == (int)Math.Round(pt2.Y)), "got incorrect mouse point"); + #endif + + // check whether the point lies within the hull + return ContainsPoint(_source, (int)pt.X, (int)pt.Y); + + // NOTE: NonRelativePosition doesn't actually return the position of the current mouse point, + // but rather the last recorded position. (See MouseDevice.GetScreenPositionFromSystem, + // which says that "Win32 has issues reliably returning where the mouse is".) + // This causes a small problem when (a) the PresentationSource has capture, e.g. + // the popup of a ComboBox, and (b) the mouse moves to a position that lies outside both the + // capturing PresentationSource (popup window) and the input-providing PresentationSource + // (main window). The MouseDevice only records positions within the input-providing + // PresentationSource, so we'll test the position where the mouse left the main window, + // rather than the current position. + // This means we may leave a tooltip open even when the mouse leaves its SafeArea, + // but only when the tooltip belongs to a capturing source, and the "leaving the SafeArea" + // action occurs outside the surrounding main window. For our example, it can happen + // when the ComboBox is close to the edge of the main window so that a tooltip from its + // popup content extends beyond the main window. + // This can only be fixed by changing MouseDevice.GetScreenPositionFromSystem to + // use a "better way" to find the current mouse position, which allegedly needs work from the OS. + // But we can live with this behavior, because + // * this is a corner case - tooltips from popup content that extend beyond the main window + // * the effect is transient - the tooltip will close when the user dismisses the popup + // * there's no accessibility issue - WCAG 2.1 only requires that the tooltip stays open under + // proscribed conditions, not that it has to close when the conditions cease to apply } // Test whether a given mouse point (x,y) lies within the convex hull From 90eee3c28633935e9d50baddf626bd9e9521f3e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 05:13:02 +0000 Subject: [PATCH 013/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220412.1 (#6409) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eafea1321e5..2e3e4555fb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 88ff411715df6da3c1e6c789496f83042b470d3a diff --git a/eng/Versions.props b/eng/Versions.props index 32cef80367b..a3c20a6527a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22207.2 + 6.0.0-rtm.22212.1 From 832934841a0eb08078e2b92f420954bbb50f299a Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 12 Apr 2022 23:02:10 -0700 Subject: [PATCH 014/188] Merging internal commits for release/6.0 (#6405) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22056.7 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22056.7 to 6.0.2-servicing.22057.4 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.4 to 6.0.2-servicing.22057.9 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.9 to 6.0.2-servicing.22057.14 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22057.14 to 6.0.2-servicing.22060.7 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.7 to 6.0.2-servicing.22060.9 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.9 to 6.0.2-servicing.22060.12 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22060.12 to 6.0.2-servicing.22063.6 (parent: Microsoft.Private.Winforms) - Source msrc from internal * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22063.6 to 6.0.2-servicing.22064.6 (parent: Microsoft.Private.Winforms) * Merged PR 20942: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220214.7 - **Date Produced**: February 15, 2022 6:38:20 AM UTC - **Commit**: 553b0d1a8c7bf45cc27282ff8afbe20f697a6601 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22114.7][9] - **Microsoft.Private.Winforms**: [from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22114.7][9] - **Microsoft.NETCore.ILDAsm**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10] - **Microsoft.NETCore.ILAsm**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10] - **Microsoft.NETCore.App.Ref**: [from 6.0.2 to 6.0.1][10] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.2 to 6.0.1][10] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5][10] [9]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC5ad241b&targetVersion=GC553b0d1&_a=files [10]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC839cdfb&targetVersion=GC3a25a7f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.NETCore.ILDAsm**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.2 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.2 to 6.0.1 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.2-servicing.22064.6 to 6.0.1-servicing.21567.5 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.1 to 6.0.3 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.1 to 6.0.3 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.1-servicing.21567.5 to 6.0.3-servicing.22115.5 (parent: Microsoft.Private.Winforms) * Merged PR 21411: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220223.7 - **Date Produced**: February 24, 2022 7:45:12 AM UTC - **Commit**: 1f426c90a9589dabc16d114aa91bfea9f21f8571 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][2] - **Microsoft.Private.Winforms**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][2] - **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.2][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.3 to 6.0.3][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCba13948&targetVersion=GC1f426c9&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC10db735&targetVersion=GCc24d9a9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) * Merge from github release/6.0 * Merged PR 21548: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220314.7 - **Date Produced**: March 14, 2022 11:33:53 PM UTC - **Commit**: 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][7] - **Microsoft.Private.Winforms**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][7] - **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.3][8] - **Microsoft.NETCore.ILDAsm**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8] - **Microsoft.NETCore.ILAsm**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8] - **Microsoft.NETCore.App.Ref**: [from 6.0.3 to 6.0.4][8] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.3 to 6.0.4][8] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8] [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1f426c9&targetVersion=GC0c636f9&_a=files [8]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc24d9a9&targetVersion=GCbe98e88&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) Co-authored-by: DotNet Bot Co-authored-by: dotnet-bot Co-authored-by: mmitche Co-authored-by: Ashish Kumar Singh --- NuGet.config | 2 ++ eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- global.json | 4 +-- 4 files changed, 41 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..ea5767e2ebc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e3e4555fb9..e3cef4423ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f426c90a9589dabc16d114aa91bfea9f21f8571 + 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f426c90a9589dabc16d114aa91bfea9f21f8571 + 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee https://github.com/dotnet/runtime @@ -45,63 +45,63 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 88ff411715df6da3c1e6c789496f83042b470d3a + c8d46e6b93f648dd15d27210af19b62f98205daa https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - 254113fd7c3ee04f832c165d6aec1a6077de0d63 + 7215d8265a7fbcd022eb72ff7a6e2048444c985f diff --git a/eng/Versions.props b/eng/Versions.props index a3c20a6527a..76d4c995f7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.3-servicing.22123.7 + 6.0.4-servicing.22164.7 5.0.0-alpha1.19562.1 - 6.0.3-servicing.22123.9 - 6.0.3-servicing.22123.9 + 6.0.4-servicing.22164.4 + 6.0.4-servicing.22164.4 - 6.0.3-servicing.22123.9 - 6.0.3 - 6.0.3 - 6.0.2 + 6.0.4-servicing.22164.4 + 6.0.4 + 6.0.4 + 6.0.3 6.0.0 6.0.0 6.0.0 @@ -56,9 +56,9 @@ - 6.0.0-beta.22206.7 - 6.0.0-beta.22206.7 - 6.0.0-beta.22206.7 + 6.0.0-beta.22122.7 + 6.0.0-beta.22122.7 + 6.0.0-beta.22122.7 diff --git a/global.json b/global.json index ecbcf88dcda..a476f2bce08 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22206.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7" }, "sdk": { "version": "6.0.103" From d3b27dec0bc79ac2fa81a50582c95657f4acf193 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 15:34:23 +0000 Subject: [PATCH 015/188] Update dependencies from https://github.com/dotnet/arcade build 20220412.5 (#6427) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 8 ++++---- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index ea5767e2ebc..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3cef4423ce..57bf4935e46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 1a6b24397e50146d0fece9cfb9c0b87275691e6f diff --git a/eng/Versions.props b/eng/Versions.props index 76d4c995f7a..c5d666cb61d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22122.7 - 6.0.0-beta.22122.7 - 6.0.0-beta.22122.7 + 6.0.0-beta.22212.5 + 6.0.0-beta.22212.5 + 6.0.0-beta.22212.5 diff --git a/global.json b/global.json index a476f2bce08..368c7a7c669 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.103", + "dotnet": "6.0.104", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22212.5" }, "sdk": { - "version": "6.0.103" + "version": "6.0.104" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From f33d5ce42fd5322620116a0136238c0c49756ca6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 13:39:16 -0700 Subject: [PATCH 016/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220413.4 (#6442) Microsoft.DotNet.Wpf.DncEng From Version 6.0.0-rtm.22212.1 -> To Version 6.0.0-rtm.22213.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57bf4935e46..f22b45a371a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - c8d46e6b93f648dd15d27210af19b62f98205daa + 3510f88911e3fea61a4eeb481d7a1fbae9795c7b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c5d666cb61d..a01174294dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22212.1 + 6.0.0-rtm.22213.4 From b9a01f76d02a543cf71702cbf63824dfd2fbd50e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Apr 2022 22:37:25 +0000 Subject: [PATCH 017/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220414.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.4-servicing.22164.7 -> To Version 6.0.5-servicing.22214.3 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.4-servicing.22164.4 -> To Version 6.0.5-servicing.22213.9 (parent: Microsoft.Private.Winforms --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..272f8566578 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f22b45a371a..f9bb45ec59e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee + a59b5f3bcf2013b0681089930dd18c65f33ec202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee + a59b5f3bcf2013b0681089930dd18c65f33ec202 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 70ae3df4a6f3c92fb6b315afc405edd10ff38579 diff --git a/eng/Versions.props b/eng/Versions.props index a01174294dc..b53658da17d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.4-servicing.22164.7 + 6.0.5-servicing.22214.3 5.0.0-alpha1.19562.1 - 6.0.4-servicing.22164.4 - 6.0.4-servicing.22164.4 + 6.0.5-servicing.22213.9 + 6.0.5-servicing.22213.9 - 6.0.4-servicing.22164.4 - 6.0.4 - 6.0.4 + 6.0.5-servicing.22213.9 + 6.0.5 + 6.0.5 6.0.3 6.0.0 6.0.0 From 6eb87ef4b90fb2fa9b65b6bf5b7039312384a400 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 3 May 2022 21:15:06 -0700 Subject: [PATCH 018/188] Update branding to 6.0.6 (#6521) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a01174294dc..082803b6c1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 5 + 6 $(MajorVersion).$(MinorVersion).$(PatchVersion) + + @@ -20,6 +22,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9bb45ec59e..f184063096c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a59b5f3bcf2013b0681089930dd18c65f33ec202 + 4b2933b3cc63a95695d541b37a4c55903a47e4d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a59b5f3bcf2013b0681089930dd18c65f33ec202 + 4b2933b3cc63a95695d541b37a4c55903a47e4d9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ae37e2b1f61..0dd74fb3cc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.5-servicing.22214.3 + 6.0.6-servicing.22253.5 From 67360ebbc2ba9c56a3948ba90e3ec172588073b7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 4 May 2022 20:40:04 +0000 Subject: [PATCH 020/188] Merged PR 22708: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22253.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22253.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.5 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22253.12 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220504.2 - **Date Produced**: May 4, 2022 6:16:53 PM UTC - **Commit**: a48d4c8636a5f196076709d710478ed31ddebd2b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22253.5 to 6.0.6-servicing.22254.2][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22253.5 to 6.0.6-servicing.22254.2][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22253.12][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22253.12][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.5 to 6.0.6][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22253.12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4b2933b&targetVersion=GCa48d4c8&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC70ae3df&targetVersion=GC441e298&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 8 ++------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc9ecbd7d1c..a931d2052b6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,7 @@ - - - + @@ -21,9 +19,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f184063096c..ddcbaa43543 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4b2933b3cc63a95695d541b37a4c55903a47e4d9 + a48d4c8636a5f196076709d710478ed31ddebd2b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4b2933b3cc63a95695d541b37a4c55903a47e4d9 + a48d4c8636a5f196076709d710478ed31ddebd2b https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 441e2988976b7e102c5182b274f13559625c13f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 441e2988976b7e102c5182b274f13559625c13f6 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 441e2988976b7e102c5182b274f13559625c13f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 441e2988976b7e102c5182b274f13559625c13f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 70ae3df4a6f3c92fb6b315afc405edd10ff38579 + 441e2988976b7e102c5182b274f13559625c13f6 diff --git a/eng/Versions.props b/eng/Versions.props index 0dd74fb3cc9..aa26f490ad9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.6-servicing.22253.5 + 6.0.6-servicing.22254.2 5.0.0-alpha1.19562.1 - 6.0.5-servicing.22213.9 - 6.0.5-servicing.22213.9 + 6.0.6-servicing.22253.12 + 6.0.6-servicing.22253.12 - 6.0.5-servicing.22213.9 - 6.0.5 - 6.0.5 + 6.0.6-servicing.22253.12 + 6.0.6 + 6.0.6 6.0.3 6.0.0 6.0.0 From b2c48192ffc7e2dbd9ebbb6e04ba40da08fd88b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 21:46:16 +0000 Subject: [PATCH 021/188] Update dependencies from https://github.com/dotnet/arcade build 20220504.3 (#6532) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f22b45a371a..5b5694aae1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 diff --git a/eng/Versions.props b/eng/Versions.props index 082803b6c1f..96b8eb9b83c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22212.5 - 6.0.0-beta.22212.5 - 6.0.0-beta.22212.5 + 6.0.0-beta.22254.3 + 6.0.0-beta.22254.3 + 6.0.0-beta.22254.3 diff --git a/global.json b/global.json index 368c7a7c669..db255e89ad4 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22212.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22254.3" }, "sdk": { "version": "6.0.104" From 1cadcac7db1994ed3c5d91476b2715a36a4f17c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 23:05:33 +0000 Subject: [PATCH 022/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220504.2 (#6533) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b5694aae1d..d4db9679763 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 3510f88911e3fea61a4eeb481d7a1fbae9795c7b + 7f73a831d291340bc04aea28f17ca0f85c1b5313 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 96b8eb9b83c..806c27f0db2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22213.4 + 6.0.0-rtm.22254.2 From c3658b2c79fec31298b9cf0055a70471df1aee31 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 4 May 2022 23:40:53 +0000 Subject: [PATCH 023/188] Merged PR 22724: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220504.6 - **Date Produced**: May 4, 2022 10:49:44 PM UTC - **Commit**: eb609dfd5a58435fb71fa8b2ce15d74c60715f91 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22254.2 to 6.0.6-servicing.22254.6][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22254.2 to 6.0.6-servicing.22254.6][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCa48d4c8&targetVersion=GCeb609df&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38f42e0cd55..9bd57c64824 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a48d4c8636a5f196076709d710478ed31ddebd2b + eb609dfd5a58435fb71fa8b2ce15d74c60715f91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a48d4c8636a5f196076709d710478ed31ddebd2b + eb609dfd5a58435fb71fa8b2ce15d74c60715f91 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 184dac536c3..c82d1a03120 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.6-servicing.22254.2 + 6.0.6-servicing.22254.6 From 736757c0193667dc19c6d9d132d93a52cc8e4805 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 5 May 2022 17:50:23 +0000 Subject: [PATCH 024/188] Merged PR 22740: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.6-servicing.22253.12 to 6.0.6-servicing.22254.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.6-servicing.22253.12 to 6.0.6-servicing.22254.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22253.12 to 6.0.6-servicing.22254.11 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220505.2 - **Date Produced**: May 5, 2022 4:38:00 PM UTC - **Commit**: 83daf50cbdf69c702829df567ac0d737007083ca - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22254.6 to 6.0.6-servicing.22255.2][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22254.6 to 6.0.6-servicing.22255.2][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.6-servicing.22253.12 to 6.0.6-servicing.22254.11][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.6-servicing.22253.12 to 6.0.6-servicing.22254.11][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.6][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22253.12 to 6.0.6-servicing.22254.11][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCeb609df&targetVersion=GC83daf50&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC441e298&targetVersion=GC3bc0fcb&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index a931d2052b6..52b042efd38 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bd57c64824..e312879b1b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eb609dfd5a58435fb71fa8b2ce15d74c60715f91 + 83daf50cbdf69c702829df567ac0d737007083ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eb609dfd5a58435fb71fa8b2ce15d74c60715f91 + 83daf50cbdf69c702829df567ac0d737007083ca https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441e2988976b7e102c5182b274f13559625c13f6 + 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441e2988976b7e102c5182b274f13559625c13f6 + 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441e2988976b7e102c5182b274f13559625c13f6 + 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441e2988976b7e102c5182b274f13559625c13f6 + 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441e2988976b7e102c5182b274f13559625c13f6 + 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 diff --git a/eng/Versions.props b/eng/Versions.props index c82d1a03120..8815569ad14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.6-servicing.22254.6 + 6.0.6-servicing.22255.2 5.0.0-alpha1.19562.1 - 6.0.6-servicing.22253.12 - 6.0.6-servicing.22253.12 + 6.0.6-servicing.22254.11 + 6.0.6-servicing.22254.11 - 6.0.6-servicing.22253.12 + 6.0.6-servicing.22254.11 6.0.6 6.0.6 6.0.3 From 46cc7ff81287c75695010bf922f47b9937bab4f0 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 9 May 2022 09:18:59 +0530 Subject: [PATCH 025/188] Don't include d3dcompiler_47.dll on ARM64. (#6496) --- Microsoft.Dotnet.Wpf.sln | 2 -- .../redist/D3DCompiler/D3DCompiler.vcxproj | 21 +++---------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln index a63f0206b90..24fd50badb4 100644 --- a/Microsoft.Dotnet.Wpf.sln +++ b/Microsoft.Dotnet.Wpf.sln @@ -1259,7 +1259,6 @@ Global {60E8E057-79E1-4860-A015-23C9587434F7}.Debug|Any CPU.Build.0 = Debug|Win32 {60E8E057-79E1-4860-A015-23C9587434F7}.Debug|Any CPU.Deploy.0 = Debug|Win32 {60E8E057-79E1-4860-A015-23C9587434F7}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {60E8E057-79E1-4860-A015-23C9587434F7}.Debug|ARM64.Build.0 = Debug|ARM64 {60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.ActiveCfg = Debug|x64 {60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.Build.0 = Debug|x64 {60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.Deploy.0 = Debug|x64 @@ -1270,7 +1269,6 @@ Global {60E8E057-79E1-4860-A015-23C9587434F7}.Release|Any CPU.Build.0 = Release|Win32 {60E8E057-79E1-4860-A015-23C9587434F7}.Release|Any CPU.Deploy.0 = Release|Win32 {60E8E057-79E1-4860-A015-23C9587434F7}.Release|ARM64.ActiveCfg = Release|ARM64 - {60E8E057-79E1-4860-A015-23C9587434F7}.Release|ARM64.Build.0 = Release|ARM64 {60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.ActiveCfg = Release|x64 {60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.Build.0 = Release|x64 {60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.Deploy.0 = Release|x64 diff --git a/src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj b/src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj index 2618d796b32..9dd3c1bb39f 100644 --- a/src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj +++ b/src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj @@ -1,18 +1,10 @@  - - Debug - ARM64 - Debug Win32 - - Release - ARM64 - Release Win32 @@ -32,25 +24,18 @@ - + $(D3DCompilerDllBaseName)$(D3DCompilerVersion)$(WpfVersionSuffix) - - $(D3DCompilerDllBaseName)$(D3DCompilerVersion) - - - + + $(Windows10SdkPath)Redist\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll - - - False - 16.0 {60E8E057-79E1-4860-A015-23C9587434F7} From e820887761d469a2b25e45f9060d0fe27db53418 Mon Sep 17 00:00:00 2001 From: Dipesh Kumar <85861525+dipeshmsft@users.noreply.github.com> Date: Tue, 10 May 2022 11:50:54 +0530 Subject: [PATCH 026/188] Fixes rounding error while glyphrun serialization (#6555) --- .../System/Windows/Media/GlyphsSerializer.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphsSerializer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphsSerializer.cs index 6a0989f2d12..886b09c3cb1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphsSerializer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/GlyphsSerializer.cs @@ -64,6 +64,8 @@ public GlyphsSerializer(GlyphRun glyphRun) _advances = glyphRun.AdvanceWidths; _offsets = glyphRun.GlyphOffsets; + _advanceWidthRoundingError = 0.0; + // "100,50,,0;".Length is a capacity estimate for an individual glyph _glyphStringBuider = new StringBuilder(10); @@ -82,6 +84,8 @@ public GlyphsSerializer(GlyphRun glyphRun) /// public void ComputeContentStrings(out string characters, out string indices, out string caretStops) { + _advanceWidthRoundingError = 0.0; + if (_clusters != null) { // the algorithm works by finding (n:m) clusters and appending m glyphs for each cluster @@ -184,7 +188,9 @@ private void AddGlyph(int glyph, int sourceCharacter) _glyphStringBuider.Append(GlyphSubEntrySeparator); // advance width - int normalizedAdvance = (int)Math.Round(_advances[glyph] * _milToEm); + double unroundedAdvance = _advances[glyph] * _milToEm; + int normalizedAdvance = (int)Math.Round(unroundedAdvance + _advanceWidthRoundingError); + _advanceWidthRoundingError += (unroundedAdvance - (double)normalizedAdvance); double fontAdvance = _sideways ? _glyphTypeface.AdvanceHeights[fontIndex] : _glyphTypeface.AdvanceWidths[fontIndex]; if (normalizedAdvance != (int)Math.Round(fontAdvance * EmScaleFactor)) { @@ -320,6 +326,8 @@ private string CreateCaretStopsString() private int _glyphClusterInitialOffset; + private double _advanceWidthRoundingError; + private IList _clusters; private IList _indices; From 81fc5da96fb43e5681f613dc2c0606ef3cd1ebec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 17:45:44 +0000 Subject: [PATCH 027/188] Update dependencies from https://github.com/dotnet/arcade build 20220511.7 (#6576) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4db9679763..645eed69484 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 diff --git a/eng/Versions.props b/eng/Versions.props index 806c27f0db2..09727937b3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22254.3 - 6.0.0-beta.22254.3 - 6.0.0-beta.22254.3 + 6.0.0-beta.22261.7 + 6.0.0-beta.22261.7 + 6.0.0-beta.22261.7 diff --git a/global.json b/global.json index db255e89ad4..46a42a0655e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.104", + "dotnet": "6.0.105", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22254.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22261.7" }, "sdk": { - "version": "6.0.104" + "version": "6.0.105" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From c2765a9441743aeb545c0e35871a585baf0ec039 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 19:02:50 +0000 Subject: [PATCH 028/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220512.2 (#6577) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 645eed69484..704a7235ce2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 7f73a831d291340bc04aea28f17ca0f85c1b5313 + 9dd507c65d0148ecceb1cd94d555ae2ee8dd0667 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 09727937b3e..08a461fd4a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22254.2 + 6.0.0-rtm.22262.2 From b42c3f500c891e4cfcdb67ff07c7a911e9db96a7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 23:30:43 +0000 Subject: [PATCH 029/188] Merged PR 22881: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.6-servicing.22254.11 to 6.0.6-servicing.22255.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.6-servicing.22254.11 to 6.0.6-servicing.22255.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22254.11 to 6.0.6-servicing.22255.10 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220512.5 - **Date Produced**: May 12, 2022 6:57:01 PM UTC - **Commit**: 54bce5195f3b5bdfd25a40d86f71c344d1a53052 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22255.2 to 6.0.6-servicing.22262.5][3] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22255.2 to 6.0.6-servicing.22262.5][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.6-servicing.22254.11 to 6.0.6-servicing.22255.10][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.6-servicing.22254.11 to 6.0.6-servicing.22255.10][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.6][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.6][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22254.11 to 6.0.6-servicing.22255.10][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC83daf50&targetVersion=GC54bce51&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC3bc0fcb&targetVersion=GC22095cd&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 52b042efd38..e2ac9105f2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f4abe3c29e..4199ede9cf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 83daf50cbdf69c702829df567ac0d737007083ca + 54bce5195f3b5bdfd25a40d86f71c344d1a53052 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 83daf50cbdf69c702829df567ac0d737007083ca + 54bce5195f3b5bdfd25a40d86f71c344d1a53052 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 + 22095cd47b192aa48ca82c514e547cc528aebd9d https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 + 22095cd47b192aa48ca82c514e547cc528aebd9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 + 22095cd47b192aa48ca82c514e547cc528aebd9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bc0fcb7bc1d9cd1b99c1963f0d781d2995b5308 + 22095cd47b192aa48ca82c514e547cc528aebd9d diff --git a/eng/Versions.props b/eng/Versions.props index bcceec83c5c..a4f650a621c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.6-servicing.22255.2 + 6.0.6-servicing.22262.5 5.0.0-alpha1.19562.1 - 6.0.6-servicing.22254.11 - 6.0.6-servicing.22254.11 + 6.0.6-servicing.22255.10 + 6.0.6-servicing.22255.10 - 6.0.6-servicing.22254.11 + 6.0.6-servicing.22255.10 6.0.6 6.0.6 6.0.3 From 01bc44ee49fad6d661709b6999002816b6dcea7a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 13 May 2022 18:35:55 +0000 Subject: [PATCH 030/188] Merged PR 22934: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22263.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22263.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22263.3 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220513.3 - **Date Produced**: May 13, 2022 5:04:36 PM UTC - **Commit**: 27d32f894c756067dcc25b08da40fed3d156a0c3 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22262.5 to 6.0.6-servicing.22263.3][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22262.5 to 6.0.6-servicing.22263.3][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22263.3][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22263.3][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.6][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22263.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC54bce51&targetVersion=GC27d32f8&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC22095cd&targetVersion=GC90b8d72&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index e2ac9105f2e..f81fe1a22f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4199ede9cf4..12a710f99b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 54bce5195f3b5bdfd25a40d86f71c344d1a53052 + 27d32f894c756067dcc25b08da40fed3d156a0c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 54bce5195f3b5bdfd25a40d86f71c344d1a53052 + 27d32f894c756067dcc25b08da40fed3d156a0c3 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22095cd47b192aa48ca82c514e547cc528aebd9d + 90b8d721e06be4d109a10f2f779f9abb560c7da5 diff --git a/eng/Versions.props b/eng/Versions.props index a4f650a621c..bdd7ca88f54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.6-servicing.22262.5 + 6.0.6-servicing.22263.3 5.0.0-alpha1.19562.1 - 6.0.6-servicing.22255.10 - 6.0.6-servicing.22255.10 + 6.0.6-servicing.22263.3 + 6.0.6-servicing.22263.3 - 6.0.6-servicing.22255.10 + 6.0.6-servicing.22263.3 6.0.6 6.0.6 6.0.3 From 78021996b14ca215bcc3ab6d53c77ba2db9309eb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 May 2022 16:43:45 +0000 Subject: [PATCH 031/188] Merged PR 22959: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22263.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22263.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22263.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220516.1 - **Date Produced**: May 16, 2022 3:44:03 PM UTC - **Commit**: 064589338cede2afd7fd8f198f7f98c9695d7a6b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22266.1][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22266.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22263.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22263.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.6][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22263.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC27d32f8&targetVersion=GC0645893&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC90b8d72&targetVersion=GC3b853d7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index f81fe1a22f9..70e00f3fdb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12a710f99b6..fd4d9730b9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 27d32f894c756067dcc25b08da40fed3d156a0c3 + 064589338cede2afd7fd8f198f7f98c9695d7a6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 27d32f894c756067dcc25b08da40fed3d156a0c3 + 064589338cede2afd7fd8f198f7f98c9695d7a6b https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90b8d721e06be4d109a10f2f779f9abb560c7da5 + 3b853d76c5431da4ce836751dc23b0b4886cf278 diff --git a/eng/Versions.props b/eng/Versions.props index bdd7ca88f54..8801ef0ff6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.6-servicing.22263.3 + 6.0.6-servicing.22266.1 5.0.0-alpha1.19562.1 - 6.0.6-servicing.22263.3 - 6.0.6-servicing.22263.3 + 6.0.6-servicing.22263.9 + 6.0.6-servicing.22263.9 - 6.0.6-servicing.22263.3 + 6.0.6-servicing.22263.9 6.0.6 6.0.6 6.0.3 From 9885e961f69f2b7fd57cfcae9ac43fce3aac750c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 May 2022 20:49:51 +0000 Subject: [PATCH 032/188] Merged PR 22972: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.6-servicing.22263.9 to 6.0.6-servicing.22263.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.6-servicing.22263.9 to 6.0.6-servicing.22263.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22263.9 to 6.0.6-servicing.22263.12 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220516.6 - **Date Produced**: May 16, 2022 6:53:49 PM UTC - **Commit**: e239afb8d3272975c62e0e7d58f2c691a8c987c7 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22266.1 to 6.0.6-servicing.22266.6][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22266.1 to 6.0.6-servicing.22266.6][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.6-servicing.22263.9 to 6.0.6-servicing.22263.12][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.6-servicing.22263.9 to 6.0.6-servicing.22263.12][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.6][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22263.9 to 6.0.6-servicing.22263.12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC0645893&targetVersion=GCe239afb&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC3b853d7&targetVersion=GCbbaceb6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 70e00f3fdb5..27a9ff913eb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd4d9730b9c..f908e560581 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 064589338cede2afd7fd8f198f7f98c9695d7a6b + e239afb8d3272975c62e0e7d58f2c691a8c987c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 064589338cede2afd7fd8f198f7f98c9695d7a6b + e239afb8d3272975c62e0e7d58f2c691a8c987c7 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + bbaceb6de0c339ec668955777c822fd79ad445ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + bbaceb6de0c339ec668955777c822fd79ad445ee https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + bbaceb6de0c339ec668955777c822fd79ad445ee https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + bbaceb6de0c339ec668955777c822fd79ad445ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + bbaceb6de0c339ec668955777c822fd79ad445ee diff --git a/eng/Versions.props b/eng/Versions.props index 8801ef0ff6d..c74fd4ceb8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.6-servicing.22266.1 + 6.0.6-servicing.22266.6 5.0.0-alpha1.19562.1 - 6.0.6-servicing.22263.9 - 6.0.6-servicing.22263.9 + 6.0.6-servicing.22263.12 + 6.0.6-servicing.22263.12 - 6.0.6-servicing.22263.9 + 6.0.6-servicing.22263.12 6.0.6 6.0.6 6.0.3 From e36f1456f1c6aff57150a30ac06f3cceaf2b2785 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 17 May 2022 16:37:34 +0000 Subject: [PATCH 033/188] Merged PR 22979: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220516.9 - **Date Produced**: May 16, 2022 9:15:22 PM UTC - **Commit**: 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22266.6 to 6.0.6-servicing.22266.9][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22266.6 to 6.0.6-servicing.22266.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCe239afb&targetVersion=GC7acd4ab&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f908e560581..056e169ba17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e239afb8d3272975c62e0e7d58f2c691a8c987c7 + 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e239afb8d3272975c62e0e7d58f2c691a8c987c7 + 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c74fd4ceb8a..72a1e1440bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.6-servicing.22266.6 + 6.0.6-servicing.22266.9 From b22892ea12fd38df0a352b2d78868d846c42f726 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 17 May 2022 23:05:19 +0000 Subject: [PATCH 034/188] Merged PR 23000: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.6-servicing.22263.12 to 6.0.6-servicing.22266.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.6-servicing.22263.12 to 6.0.6-servicing.22266.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22263.12 to 6.0.6-servicing.22266.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220517.2 - **Date Produced**: May 17, 2022 9:18:39 PM UTC - **Commit**: 015553608392acaba07938202d1333a34fee6fb7 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.2][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.2][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.6-servicing.22263.12 to 6.0.6-servicing.22266.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.6-servicing.22263.12 to 6.0.6-servicing.22266.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.6][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22263.12 to 6.0.6-servicing.22266.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC7acd4ab&targetVersion=GC0155536&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCbbaceb6&targetVersion=GC1ea6047&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 27a9ff913eb..8874fb15439 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 056e169ba17..d1fe93f1eba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 + 015553608392acaba07938202d1333a34fee6fb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 + 015553608392acaba07938202d1333a34fee6fb7 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bbaceb6de0c339ec668955777c822fd79ad445ee + 1ea60472eea9d0d5db9c09fba622c826c96ec90a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bbaceb6de0c339ec668955777c822fd79ad445ee + 1ea60472eea9d0d5db9c09fba622c826c96ec90a https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bbaceb6de0c339ec668955777c822fd79ad445ee + 1ea60472eea9d0d5db9c09fba622c826c96ec90a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bbaceb6de0c339ec668955777c822fd79ad445ee + 1ea60472eea9d0d5db9c09fba622c826c96ec90a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bbaceb6de0c339ec668955777c822fd79ad445ee + 1ea60472eea9d0d5db9c09fba622c826c96ec90a diff --git a/eng/Versions.props b/eng/Versions.props index 72a1e1440bd..8d813d984d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.6-servicing.22266.9 + 6.0.6-servicing.22267.2 5.0.0-alpha1.19562.1 - 6.0.6-servicing.22263.12 - 6.0.6-servicing.22263.12 + 6.0.6-servicing.22266.9 + 6.0.6-servicing.22266.9 - 6.0.6-servicing.22263.12 + 6.0.6-servicing.22266.9 6.0.6 6.0.6 6.0.3 From dabcf2041548f7594b21e9bf865463abdfd14307 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 May 2022 15:10:29 +0000 Subject: [PATCH 035/188] Merged PR 23010: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.3 to 6.0.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220517.5 - **Date Produced**: May 17, 2022 11:36:43 PM UTC - **Commit**: 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22267.2 to 6.0.6-servicing.22267.5][1] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22267.2 to 6.0.6-servicing.22267.5][1] - **Microsoft.NETCore.Platforms**: [from 6.0.3 to 6.0.4][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.7][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.7][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.6][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.6][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.7][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC0155536&targetVersion=GC604b5d0&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCbe98e88&targetVersion=GC7cca709&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1ea6047&targetVersion=GC7cca709&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8874fb15439..a03786b5aa3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1fe93f1eba..5969a3bbdcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 015553608392acaba07938202d1333a34fee6fb7 + 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 015553608392acaba07938202d1333a34fee6fb7 + 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1ea60472eea9d0d5db9c09fba622c826c96ec90a + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1ea60472eea9d0d5db9c09fba622c826c96ec90a + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1ea60472eea9d0d5db9c09fba622c826c96ec90a + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1ea60472eea9d0d5db9c09fba622c826c96ec90a + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1ea60472eea9d0d5db9c09fba622c826c96ec90a + 7cca709db2944a09b4db6ca7b20c457ff260fb5a diff --git a/eng/Versions.props b/eng/Versions.props index 8d813d984d7..417d2579c6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.6-servicing.22267.2 + 6.0.6-servicing.22267.5 5.0.0-alpha1.19562.1 - 6.0.6-servicing.22266.9 - 6.0.6-servicing.22266.9 + 6.0.6-servicing.22267.7 + 6.0.6-servicing.22267.7 - 6.0.6-servicing.22266.9 + 6.0.6-servicing.22267.7 6.0.6 6.0.6 - 6.0.3 + 6.0.4 6.0.0 6.0.0 6.0.0 From 939e70b4fd8f04b2b7f8ede2cd01e1cc1eba2a26 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 8 Jun 2022 23:33:20 -0700 Subject: [PATCH 036/188] Update branding to 6.0.7 (#6662) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 08a461fd4a8..e85aefd11e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 6 + 7 $(MajorVersion).$(MinorVersion).$(PatchVersion) + + + @@ -19,6 +22,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5969a3bbdcb..c8961ee8a36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/arcade - e3cbecc5b0e51374e3d71dbb976004ab9cc90430 + fdd3a242bc813f371023adff4e4c05c0be705d2a diff --git a/eng/Versions.props b/eng/Versions.props index c9c2fa77730..dc33d5ba3bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22261.7 - 6.0.0-beta.22261.7 - 6.0.0-beta.22261.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 + 6.0.0-beta.22314.7 diff --git a/global.json b/global.json index 46a42a0655e..eb8b81e05cc 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.105", + "dotnet": "6.0.106", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22261.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22314.7" }, "sdk": { - "version": "6.0.105" + "version": "6.0.106" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From f0fb1956690b1da73b879dce6026430613bbe91c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 01:36:45 +0000 Subject: [PATCH 039/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220614.4 (#6686) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8961ee8a36..e65fabe5472 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 9dd507c65d0148ecceb1cd94d555ae2ee8dd0667 + 02282bc994b3e7cd210e76caca2daa1cbcf934c4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index dc33d5ba3bc..5036c8126d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22262.2 + 6.0.0-rtm.22314.4 From 85cc0816099f94dc4f3e89b64f77ba9fb32fc4ed Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 20 Jun 2022 17:00:38 +0000 Subject: [PATCH 040/188] Merged PR 23418: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220614.5 - **Date Produced**: June 15, 2022 1:42:37 AM UTC - **Commit**: 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22314.5][3] - **Microsoft.Private.Winforms**: [from 6.0.6-servicing.22267.5 to 6.0.7-servicing.22314.5][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC604b5d0&targetVersion=GC4b0f47c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e65fabe5472..fb5cbdd5021 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 + 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8 + 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5036c8126d9..a83d373d227 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.6-servicing.22267.5 + 6.0.7-servicing.22314.5 From 748b0b3c6bac90d87006466edb9c7af13a71fc45 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 21 Jun 2022 10:50:43 -0700 Subject: [PATCH 041/188] [release/6.0] Remove duplicate references (#6704) * Remove duplicate reference * Fixing the C++/CLI projects failing due to NU1504 (#6698) * Update azure-pipelines.yml * Update pipeline.yml * update to scouting queue temporarily * temp workaround for 6.0 build fail * Update azure-pipelines.yml * Update pipeline.yml Co-authored-by: Dipesh Kumar <85861525+dipeshmsft@users.noreply.github.com> Co-authored-by: Ashish Singh --- eng/WpfArcadeSdk/tools/Wpf.Cpp.targets | 10 +++ .../DirectWriteForwarder.vcxproj | 5 ++ .../src/PresentationUI/PresentationUI.csproj | 1 - .../System.Printing/System.Printing.vcxproj | 72 +++++++++++++++++++ 4 files changed, 87 insertions(+), 1 deletion(-) diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets index f1a7de9a9bb..ad973b35172 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets @@ -353,6 +353,16 @@ using namespace System::Runtime::Versioning; + + + + + + .NETCoreApp v6.0 Unknown + + true diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj index 421b0514185..2cb661f507d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj @@ -216,7 +216,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj index e7ef43e64b2..3daf8224a4b 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj @@ -31,6 +31,11 @@ .NETCoreApp v6.0 Unknown + + true @@ -233,4 +238,71 @@ unknownrev + + + + <_Temporary Remove="@(_Temporary)"/> + + + + + + + + + + + + + + + + + + + + + + + + <_Temporary Include ="@(EmbeddedResource)" Condition="'%(EmbeddedResource.ManifestResourceName)' != '' "/> + <_Temporary> + $(TargetPath) + $(ProjectPath) + + + + + + + + + <_Temporary Remove="@(_Temporary)"/> + <_OutOfDateEmbeddedResource Remove="@(_OutOfDateEmbeddedResource)" /> + + + From 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 18:18:01 +0000 Subject: [PATCH 042/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.Platforms: from 6.0.4 to 6.0.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.6 to 6.0.7 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.6 to 6.0.7 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2 (parent: Microsoft.Private.Winforms) --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f4d5b59509..a717363759f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,10 +5,7 @@ - - - - + @@ -22,10 +19,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb5cbdd5021..454fc7b43fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 + 24977050704b627e631caf7b1ca4bcb0543f3ab2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4b0f47cc42333dbf99fed45b92c13c93ce0ca804 + 24977050704b627e631caf7b1ca4bcb0543f3ab2 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 diff --git a/eng/Versions.props b/eng/Versions.props index a83d373d227..2172bc0ff26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.7-servicing.22314.5 + 6.0.7-servicing.22322.3 5.0.0-alpha1.19562.1 - 6.0.6-servicing.22267.7 - 6.0.6-servicing.22267.7 + 6.0.7-servicing.22322.2 + 6.0.7-servicing.22322.2 - 6.0.6-servicing.22267.7 - 6.0.6 - 6.0.6 - 6.0.4 + 6.0.7-servicing.22322.2 + 6.0.7 + 6.0.7 + 6.0.5 6.0.0 6.0.0 6.0.0 From 45038edb206f80526b4613195cad2505d5e1dc90 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 6 Jul 2022 07:25:11 -0700 Subject: [PATCH 043/188] Update branding to 6.0.8 (#6756) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5036c8126d9..8f3ced3ed3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 7 + 8 $(MajorVersion).$(MinorVersion).$(PatchVersion) - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 454fc7b43fd..da987cd0119 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24977050704b627e631caf7b1ca4bcb0543f3ab2 + ff733653b44bbd79d865172a0095f73be4c130d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24977050704b627e631caf7b1ca4bcb0543f3ab2 + ff733653b44bbd79d865172a0095f73be4c130d5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7010b4c9046..118dbdf2513 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.7-servicing.22322.3 + 6.0.8-servicing.22362.3 From 9c2ea15553bfb47efa570834420d712c0c03fc41 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 13 Jul 2022 17:59:46 +0000 Subject: [PATCH 045/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Security.Cryptography.Xml: from 6.0.0 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.5 to 6.0.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.7 to 6.0.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.7 to 6.0.8 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) --- NuGet.config | 2 ++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 14 +++++++------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..eab4a05776e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da987cd0119..2c3ab029882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ff733653b44bbd79d865172a0095f73be4c130d5 + a6147ede115b67f6c03869944ab43335026c5278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ff733653b44bbd79d865172a0095f73be4c130d5 + a6147ede115b67f6c03869944ab43335026c5278 https://github.com/dotnet/runtime @@ -33,9 +33,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 diff --git a/eng/Versions.props b/eng/Versions.props index 118dbdf2513..34fbdab4324 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.8-servicing.22362.3 + 6.0.8-servicing.22363.3 5.0.0-alpha1.19562.1 - 6.0.7-servicing.22322.2 - 6.0.7-servicing.22322.2 + 6.0.8-servicing.22362.13 + 6.0.8-servicing.22362.13 - 6.0.7-servicing.22322.2 - 6.0.7 - 6.0.7 + 6.0.8-servicing.22362.13 + 6.0.8 + 6.0.8 6.0.5 6.0.0 6.0.0 @@ -50,7 +50,7 @@ 6.0.0 6.0.0 4.6.0-preview4.19176.11 - 6.0.0 + 6.0.1 6.0.0 6.0.0 From 629fa4b5d72642eeb9a3931ad4d107594663c0f5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 14 Jul 2022 00:40:27 +0000 Subject: [PATCH 046/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.8 to 6.0.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.8 to 6.0.8 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index eab4a05776e..f4e71154877 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c3ab029882..30f5f28800c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a6147ede115b67f6c03869944ab43335026c5278 + 876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a6147ede115b67f6c03869944ab43335026c5278 + 876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f https://github.com/dotnet/runtime @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e diff --git a/eng/Versions.props b/eng/Versions.props index 34fbdab4324..94fcec059f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.8-servicing.22363.3 + 6.0.8-servicing.22363.7 5.0.0-alpha1.19562.1 - 6.0.8-servicing.22362.13 - 6.0.8-servicing.22362.13 + 6.0.8-servicing.22363.6 + 6.0.8-servicing.22363.6 - 6.0.8-servicing.22362.13 + 6.0.8-servicing.22363.6 6.0.8 6.0.8 6.0.5 From 7a75fd34f53bc300206bd8cfc636527934dd17af Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 17:10:28 +0000 Subject: [PATCH 047/188] Merged PR 24215: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.5 to 6.0.5 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220718.4 - **Date Produced**: July 18, 2022 4:28:05 PM UTC - **Commit**: bcdb000de284571bf5267aa3d052dee7918c1e6e - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][1] - **Microsoft.Private.Winforms**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC876ba0c&targetVersion=GCbcdb000&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCf316191&targetVersion=GC0ec02c8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30f5f28800c..0eb6e6dc4f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f + bcdb000de284571bf5267aa3d052dee7918c1e6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f + bcdb000de284571bf5267aa3d052dee7918c1e6e https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int diff --git a/eng/Versions.props b/eng/Versions.props index 94fcec059f8..aedbf759ada 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.8-servicing.22363.7 + 6.0.8-servicing.22368.4 From 6ef7110f7a7e59e2b0685d95aa08d6e793f93f2c Mon Sep 17 00:00:00 2001 From: Dipesh Kumar <85861525+dipeshmsft@users.noreply.github.com> Date: Tue, 19 Jul 2022 10:51:53 +0530 Subject: [PATCH 048/188] Fix build when using source generators coming from NuGet package (#6800) --- .../Microsoft.WinFX.targets | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets index aef40014f29..021bfb832ec 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets @@ -513,6 +513,20 @@ + + + + + + + + - From 0648dc9d0eb35b94df4899a938bf12f334b07050 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 2 Aug 2022 21:49:29 -0700 Subject: [PATCH 049/188] Update branding to 6.0.9 (#6866) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7010b4c9046..871be48cc9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 8 + 9 $(MajorVersion).$(MinorVersion).$(PatchVersion) - - - - - - - - - - - - - - - - - - - - - <_Temporary Include ="@(EmbeddedResource)" Condition="'%(EmbeddedResource.ManifestResourceName)' != '' "/> - <_Temporary> - $(TargetPath) - $(ProjectPath) - - - - - - - - - <_Temporary Remove="@(_Temporary)"/> - <_OutOfDateEmbeddedResource Remove="@(_OutOfDateEmbeddedResource)" /> - - - From 38ab2f6cf4b4e4dbe4a7dbbbd8f91fc27a532434 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 10 Aug 2022 02:25:49 -0700 Subject: [PATCH 051/188] Merging internal commits for release/6.0 (#6875) * Merged PR 23885: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220712.3 - **Date Produced**: July 12, 2022 11:02:17 PM UTC - **Commit**: ff733653b44bbd79d865172a0095f73be4c130d5 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22362.3][2] - **Microsoft.Private.Winforms**: [from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22362.3][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2497705&targetVersion=GCff73365&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Security.Cryptography.Xml: from 6.0.0 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.5 to 6.0.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.7 to 6.0.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.7 to 6.0.8 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.8 to 6.0.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.8 to 6.0.8 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) * Merged PR 24215: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.5 to 6.0.5 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220718.4 - **Date Produced**: July 18, 2022 4:28:05 PM UTC - **Commit**: bcdb000de284571bf5267aa3d052dee7918c1e6e - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][1] - **Microsoft.Private.Winforms**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC876ba0c&targetVersion=GCbcdb000&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCf316191&targetVersion=GC0ec02c8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) Co-authored-by: dotnet-bot Co-authored-by: DotNet Bot --- NuGet.config | 4 ++-- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index a717363759f..f4e71154877 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 454fc7b43fd..0eb6e6dc4f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24977050704b627e631caf7b1ca4bcb0543f3ab2 + bcdb000de284571bf5267aa3d052dee7918c1e6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24977050704b627e631caf7b1ca4bcb0543f3ab2 + bcdb000de284571bf5267aa3d052dee7918c1e6e https://github.com/dotnet/runtime @@ -33,9 +33,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e diff --git a/eng/Versions.props b/eng/Versions.props index 871be48cc9a..5dc29c2f8b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.7-servicing.22322.3 + 6.0.8-servicing.22368.4 5.0.0-alpha1.19562.1 - 6.0.7-servicing.22322.2 - 6.0.7-servicing.22322.2 + 6.0.8-servicing.22363.6 + 6.0.8-servicing.22363.6 - 6.0.7-servicing.22322.2 - 6.0.7 - 6.0.7 + 6.0.8-servicing.22363.6 + 6.0.8 + 6.0.8 6.0.5 6.0.0 6.0.0 @@ -50,7 +50,7 @@ 6.0.0 6.0.0 4.6.0-preview4.19176.11 - 6.0.0 + 6.0.1 6.0.0 6.0.0 From 38f74fe6faace6a5ed95e2c68e90b4f0f8d7769f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Aug 2022 17:45:45 +0000 Subject: [PATCH 052/188] Update dependencies from https://github.com/dotnet/arcade build 20220811.3 (#6894) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 - eng/Version.Details.xml | 20 +-- eng/Versions.props | 6 +- eng/common/generate-sbom-prep.ps1 | 2 + eng/common/generate-sbom-prep.sh | 12 ++ eng/common/init-tools-native.ps1 | 144 ++++++++++++------ 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, 148 insertions(+), 70 deletions(-) create mode 100644 eng/common/internal/NuGet.config diff --git a/NuGet.config b/NuGet.config index f4e71154877..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0eb6e6dc4f2..c49298a6507 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + 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/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 778552f02f31d50ec1c3c18a872cc482d04aec75 diff --git a/eng/Versions.props b/eng/Versions.props index 5dc29c2f8b1..976981d1c26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 + 6.0.0-beta.22411.3 + 6.0.0-beta.22411.3 + 6.0.0-beta.22411.3 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index a733a888582..3e5c1c74a1c 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 f6c77453142..d5c76dc827b 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 db830c00a6f..7428ef88084 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 ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false + if ($PathPromotion -eq $True) { + if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $InstalledTools = @{} + + 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 } - if ($showNativeToolsWarning) { - Write-Warning $errMsg + $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 } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - 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 + } + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } + + if ($Verbose) { + $LocalInstallerArguments += @{ Verbose = $True } + } + if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { + if($Force) { + $LocalInstallerArguments += @{ Force = $True } + } + } + if ($Clean) { + $LocalInstallerArguments += @{ Clean = $True } + } + + Write-Verbose "Installing $ToolName version $ToolVersion" + Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" + & $InstallerPath @LocalInstallerArguments + if ($LASTEXITCODE -Ne "0") { + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + $showNativeToolsWarning = $true + if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { + $showNativeToolsWarning = $false + } + if ($showNativeToolsWarning) { + Write-Warning $errMsg + } + $toolInstallationFailure = $true + } else { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host $errMsg + exit 1 + } + } + } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host 'Native tools bootstrap failed' + exit 1 } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 } } else { @@ -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 00000000000..19d3d311b16 --- /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 beb9c4648ea..7f5ce6d6081 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 24cec0424e5..9ff6a10a682 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 9d1e3042d8a..991ae05f5db 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 554e71cfc43..48918df740b 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 24e92a275a4..27060712681 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 f1e1cb53953..81d7b0355e3 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 eb8b81e05cc..ac7eb2ec0d9 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22314.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22411.3" }, "sdk": { "version": "6.0.106" From 50fc0dc3bc4a5c303d6fab01ce32047e9111cf0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Aug 2022 18:51:39 +0000 Subject: [PATCH 053/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220812.6 (#6895) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c49298a6507..1d61da2b0eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 02282bc994b3e7cd210e76caca2daa1cbcf934c4 + 349fb5a13814e6bac5435ff5595ecc9b043e6315 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 976981d1c26..21db426a037 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22314.4 + 6.0.0-rtm.22412.6 From 40c4c0c7ea7ef93bf9876838aa895402464a69ea Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 22:18:13 +0000 Subject: [PATCH 054/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d61da2b0eb..7a10ac1443a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 21db426a037..5385d5e221d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.8-servicing.22368.4 + 6.0.9-servicing.22412.3 From 628baf1b61bf7f2b8711cd899f4095bc2013cf79 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 13 Aug 2022 16:56:24 +0000 Subject: [PATCH 055/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Configuration.ConfigurationManager: from 6.0.0 to 6.0.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.8-servicing.22363.6 to 6.0.9-servicing.22412.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.8-servicing.22363.6 to 6.0.9-servicing.22412.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.8 to 6.0.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.8 to 6.0.9 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.8-servicing.22363.6 to 6.0.9-servicing.22412.2 (parent: Microsoft.Private.Winforms) --- NuGet.config | 4 ++++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 14 +++++++------- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..e67030faefd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + @@ -18,6 +20,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a10ac1443a..eae96537d8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb + 70ab481a2ed42f7766251c73066d47148e902d5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6f5638fe4b15ea2a3b326366aab1c1d2b3e8e4eb + 70ab481a2ed42f7766251c73066d47148e902d5e https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 41db717d4a566577c1819b1690a454e4ce939f93 https://github.com/dotnet/runtime @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 41db717d4a566577c1819b1690a454e4ce939f93 diff --git a/eng/Versions.props b/eng/Versions.props index 5385d5e221d..c909f0c7d3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.9-servicing.22412.3 + 6.0.9-servicing.22412.5 5.0.0-alpha1.19562.1 - 6.0.8-servicing.22363.6 - 6.0.8-servicing.22363.6 + 6.0.9-servicing.22412.2 + 6.0.9-servicing.22412.2 - 6.0.8-servicing.22363.6 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22412.2 + 6.0.9 + 6.0.9 6.0.5 6.0.0 6.0.0 @@ -47,7 +47,7 @@ 6.0.0 - 6.0.0 + 6.0.1 6.0.0 4.6.0-preview4.19176.11 6.0.1 From 3f139002a82b47fc7531b7ef0b7bb4237ff734d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 16:38:14 +0000 Subject: [PATCH 056/188] Update dependencies from https://github.com/dotnet/arcade build 20220812.2 (#6897) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d61da2b0eb..ec32a571e19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + 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/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 41323ecb0b2312980381bfdbb75afd2dae2b266b diff --git a/eng/Versions.props b/eng/Versions.props index 21db426a037..296768521e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22411.3 - 6.0.0-beta.22411.3 - 6.0.0-beta.22411.3 + 6.0.0-beta.22412.2 + 6.0.0-beta.22412.2 + 6.0.0-beta.22412.2 diff --git a/global.json b/global.json index ac7eb2ec0d9..812f247a2cb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.106", + "dotnet": "6.0.108", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22411.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22412.2" }, "sdk": { - "version": "6.0.106" + "version": "6.0.108" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 3e6ca91c8b1862480281108ed1c326345c3bd0bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 18:00:53 +0000 Subject: [PATCH 057/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220815.2 (#6899) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec32a571e19..d8068e6bc3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 349fb5a13814e6bac5435ff5595ecc9b043e6315 + 2ff9f177d3c814a6682f22bc717c953079717585 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 296768521e2..5ad2e24a770 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22412.6 + 6.0.0-rtm.22415.2 From 39485e9656dd5d17cb3f20a5d138ccd59e49193c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 15 Aug 2022 18:23:42 +0000 Subject: [PATCH 058/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a32ca6ac2cf..888509792eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 70ab481a2ed42f7766251c73066d47148e902d5e + bd8bcd736369f3c0ad4f0da32be44190a544753d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 70ab481a2ed42f7766251c73066d47148e902d5e + bd8bcd736369f3c0ad4f0da32be44190a544753d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 98bb189d981..4b0899b06d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.9-servicing.22412.5 + 6.0.9-servicing.22415.2 From df4d286a001fa1e0bd05d54e590ffb86c75a3313 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Aug 2022 06:02:50 +0000 Subject: [PATCH 059/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Configuration.ConfigurationManager: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.9-servicing.22412.2 to 6.0.9-servicing.22413.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.9-servicing.22412.2 to 6.0.9-servicing.22413.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.9-servicing.22412.2 to 6.0.9-servicing.22413.8 (parent: Microsoft.Private.Winforms) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e67030faefd..1a7c66225d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,7 @@ - - + @@ -20,8 +19,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 888509792eb..81f27a6767b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd8bcd736369f3c0ad4f0da32be44190a544753d + eb003bd0bb9cb6aec94234c0f6347539d5c20864 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd8bcd736369f3c0ad4f0da32be44190a544753d + eb003bd0bb9cb6aec94234c0f6347539d5c20864 https://github.com/dotnet/runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://github.com/dotnet/runtime @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 diff --git a/eng/Versions.props b/eng/Versions.props index 4b0899b06d1..23adeac09cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.9-servicing.22415.2 + 6.0.9-servicing.22415.4 5.0.0-alpha1.19562.1 - 6.0.9-servicing.22412.2 - 6.0.9-servicing.22412.2 + 6.0.9-servicing.22413.8 + 6.0.9-servicing.22413.8 - 6.0.9-servicing.22412.2 + 6.0.9-servicing.22413.8 6.0.9 6.0.9 6.0.5 From 9259370a4a858f7ce075b7a6f5b071e418f34c23 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Aug 2022 08:35:48 +0000 Subject: [PATCH 060/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Configuration.ConfigurationManager: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.9-servicing.22413.8 to 6.0.9-servicing.22415.4 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.9-servicing.22413.8 to 6.0.9-servicing.22415.4 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.9-servicing.22413.8 to 6.0.9-servicing.22415.4 (parent: Microsoft.Private.Winforms) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a7c66225d3..6e1d35e535c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81f27a6767b..15726965380 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eb003bd0bb9cb6aec94234c0f6347539d5c20864 + 8be00e9ff6372aa17c2666213eea2025b1a3266b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eb003bd0bb9cb6aec94234c0f6347539d5c20864 + 8be00e9ff6372aa17c2666213eea2025b1a3266b https://github.com/dotnet/runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://github.com/dotnet/runtime @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 diff --git a/eng/Versions.props b/eng/Versions.props index 23adeac09cb..a72fb286774 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.9-servicing.22415.4 + 6.0.9-servicing.22415.17 5.0.0-alpha1.19562.1 - 6.0.9-servicing.22413.8 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22415.4 + 6.0.9-servicing.22415.4 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22415.4 6.0.9 6.0.9 6.0.5 From 21c3e147da95936135fc9ec86bfc0146df878884 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Aug 2022 09:58:06 +0000 Subject: [PATCH 061/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220816.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22415.17 -> To Version 6.0.9-servicing.22416.1 Dependency coherency updates System.Configuration.ConfigurationManager,System.Security.Cryptography.Xml,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e1d35e535c..c4a9c9482ba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15726965380..9f9041c2dc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8be00e9ff6372aa17c2666213eea2025b1a3266b + 491c3f44dc132435722e1b1efe55da8b11be1b28 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8be00e9ff6372aa17c2666213eea2025b1a3266b + 491c3f44dc132435722e1b1efe55da8b11be1b28 https://github.com/dotnet/runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://github.com/dotnet/runtime @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab diff --git a/eng/Versions.props b/eng/Versions.props index a72fb286774..41460e539db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.9-servicing.22415.17 + 6.0.9-servicing.22416.1 5.0.0-alpha1.19562.1 - 6.0.9-servicing.22415.4 - 6.0.9-servicing.22415.4 + 6.0.9-servicing.22415.12 + 6.0.9-servicing.22415.12 - 6.0.9-servicing.22415.4 + 6.0.9-servicing.22415.12 6.0.9 6.0.9 6.0.5 From 78c6a489413815a7f6df73b6d72948ee924319e3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Aug 2022 17:35:17 +0000 Subject: [PATCH 062/188] Merged PR 25059: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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**: - **System.Configuration.ConfigurationManager**: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220817.1 - **Date Produced**: August 17, 2022 4:40:12 PM UTC - **Commit**: 5d275019237fbf9f4bf5d867f779c616ec264718 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.9-servicing.22416.1 to 6.0.9-servicing.22417.1][1] - **Microsoft.Private.Winforms**: [from 6.0.9-servicing.22416.1 to 6.0.9-servicing.22417.1][1] - **System.Configuration.ConfigurationManager**: [from 6.0.1 to 6.0.1][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.9][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC491c3f4&targetVersion=GC5d27501&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCb114055&targetVersion=GCca2f175&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index c4a9c9482ba..1f44786521e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f9041c2dc2..660f81129d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 491c3f44dc132435722e1b1efe55da8b11be1b28 + 5d275019237fbf9f4bf5d867f779c616ec264718 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 491c3f44dc132435722e1b1efe55da8b11be1b28 + 5d275019237fbf9f4bf5d867f779c616ec264718 https://github.com/dotnet/runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 diff --git a/eng/Versions.props b/eng/Versions.props index 41460e539db..0bbc971e6d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.9-servicing.22416.1 + 6.0.9-servicing.22417.1 5.0.0-alpha1.19562.1 - 6.0.9-servicing.22415.12 - 6.0.9-servicing.22415.12 + 6.0.9-servicing.22416.9 + 6.0.9-servicing.22416.9 - 6.0.9-servicing.22415.12 + 6.0.9-servicing.22416.9 6.0.9 6.0.9 6.0.5 From 10342c6134e40245ef9847464cc7d92b30c54992 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Aug 2022 12:36:26 -0700 Subject: [PATCH 063/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220817.1 (#6913) Microsoft.DotNet.Wpf.DncEng From Version 6.0.0-rtm.22415.2 -> To Version 6.0.0-rtm.22417.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8068e6bc3c..eacfa77875f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 2ff9f177d3c814a6682f22bc717c953079717585 diff --git a/eng/Versions.props b/eng/Versions.props index 5ad2e24a770..b995818617d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22415.2 + 6.0.0-rtm.22417.1 From 95b3174d113cc962c87c0b5fdb31a6318e0d4500 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Aug 2022 20:31:05 +0000 Subject: [PATCH 064/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220818.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22417.1 -> To Version 6.0.9-servicing.22418.3 Dependency coherency updates System.Security.Cryptography.Xml From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4296b2b9871..43adecdda2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5d275019237fbf9f4bf5d867f779c616ec264718 + 0a6ea378000e25e4cbcc17485513fd487fec5dab - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5d275019237fbf9f4bf5d867f779c616ec264718 + 0a6ea378000e25e4cbcc17485513fd487fec5dab https://github.com/dotnet/runtime @@ -35,7 +35,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2defa1a68d9..70ca9962f17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.9-servicing.22417.1 + 6.0.9-servicing.22418.3 From 2fb6c9d51ef55ba701c3cd6ca2d7da26f8137134 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Aug 2022 07:13:00 +0000 Subject: [PATCH 065/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220819.10 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22418.3 -> To Version 6.0.9-servicing.22419.10 Dependency coherency updates System.Configuration.ConfigurationManager,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f44786521e..3af44f84032 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43adecdda2b..afbbe3f8a0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0a6ea378000e25e4cbcc17485513fd487fec5dab + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0a6ea378000e25e4cbcc17485513fd487fec5dab + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c https://github.com/dotnet/runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 163a63591cf9e9b682063cf3995948c2b885a042 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ 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 diff --git a/eng/Versions.props b/eng/Versions.props index 70ca9962f17..d9d6f15240f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.9-servicing.22418.3 + 6.0.9-servicing.22419.10 5.0.0-alpha1.19562.1 - 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-servicing.22416.9 + 6.0.9-servicing.22419.5 6.0.9 6.0.9 6.0.5 From 9dfadc9bebb39ecc78894be7861ad7dec708f86d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 2 Sep 2022 21:41:21 +0000 Subject: [PATCH 066/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220902.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22419.10 -> To Version 6.0.9-servicing.22452.2 Dependency coherency updates System.Configuration.ConfigurationManager,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3af44f84032..47d4718dbb6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afbbe3f8a0a..85aa4c3c207 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 53556f9f694ff0711b6a97bc6eee7be4d7930af5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 53556f9f694ff0711b6a97bc6eee7be4d7930af5 https://github.com/dotnet/runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 diff --git a/eng/Versions.props b/eng/Versions.props index d9d6f15240f..42b3bdd2126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.9-servicing.22419.10 + 6.0.9-servicing.22452.2 5.0.0-alpha1.19562.1 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 + 6.0.9-servicing.22451.7 + 6.0.9-servicing.22451.7 - 6.0.9-servicing.22419.5 + 6.0.9-servicing.22451.7 6.0.9 6.0.9 6.0.5 From 9200a39fca0e99c3ab22bb4c041613e00fc6b34a Mon Sep 17 00:00:00 2001 From: Alex Perovich Date: Tue, 6 Sep 2022 04:15:15 -0700 Subject: [PATCH 067/188] Update public pool names (#6996) --- eng/common/templates/job/source-build.yml | 2 +- eng/pipeline.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5cd5325d7b4..88f6f75a622 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/eng/pipeline.yml b/eng/pipeline.yml index 1264aab9a4a..a5f25fb8faf 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -34,7 +34,7 @@ jobs: # Will eventually change this to two BYOC pools. # agent pool can't be read from a user-defined variable (Azure DevOps limitation) ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal From ec1c6a41075733eacb6ed7e21fce23faa022c5c4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Sep 2022 19:34:32 +0000 Subject: [PATCH 068/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220906.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22419.10 -> To Version 6.0.9-servicing.22456.5 Dependency coherency updates System.Configuration.ConfigurationManager,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85aa4c3c207..58390732dfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53556f9f694ff0711b6a97bc6eee7be4d7930af5 + 265148997a158fce975123916516fc761ce59335 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53556f9f694ff0711b6a97bc6eee7be4d7930af5 + 265148997a158fce975123916516fc761ce59335 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 42b3bdd2126..24ad5a41f69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.9-servicing.22452.2 + 6.0.9-servicing.22456.5 From 85ce329c2965577113bf80a44dd284f0f946bfb4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 02:16:20 +0000 Subject: [PATCH 069/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220906.10 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22419.10 -> To Version 6.0.10-servicing.22456.10 Dependency coherency updates System.Configuration.ConfigurationManager,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58390732dfe..a4f5451a622 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 265148997a158fce975123916516fc761ce59335 + 015909e040e794bb74ea3b221321dd72e5258c15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 265148997a158fce975123916516fc761ce59335 + 015909e040e794bb74ea3b221321dd72e5258c15 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 24ad5a41f69..3cf893cdf84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.9-servicing.22456.5 + 6.0.10-servicing.22456.10 From 544805493a7a7c8a02d0027e67fc74e77b81b636 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Sep 2022 21:51:44 -0700 Subject: [PATCH 070/188] Update branding to 6.0.10 (#7014) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b995818617d..1c00ab9c638 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 9 + 10 $(MajorVersion).$(MinorVersion).$(PatchVersion) - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4f5451a622..9caee4e13ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 015909e040e794bb74ea3b221321dd72e5258c15 + 05fbf93f202984cf4e15591c0c9cfc14392f623d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 015909e040e794bb74ea3b221321dd72e5258c15 + 05fbf93f202984cf4e15591c0c9cfc14392f623d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3cf893cdf84..305e5c81efd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.10-servicing.22456.10 + 6.0.10-servicing.22463.10 From e45356deeb33ffb677dfef91062e4a9b0c514524 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 13 Sep 2022 22:32:24 -0700 Subject: [PATCH 072/188] Merging internal commits for release/6.0 (#7037) * Merged PR 23885: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220712.3 - **Date Produced**: July 12, 2022 11:02:17 PM UTC - **Commit**: ff733653b44bbd79d865172a0095f73be4c130d5 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22362.3][2] - **Microsoft.Private.Winforms**: [from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22362.3][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2497705&targetVersion=GCff73365&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Security.Cryptography.Xml: from 6.0.0 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 6.0.5 to 6.0.5 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.7 to 6.0.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.7 to 6.0.8 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22362.13 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.8 to 6.0.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.8 to 6.0.8 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.Private.Winforms) * Merged PR 24215: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.5 to 6.0.5 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220718.4 - **Date Produced**: July 18, 2022 4:28:05 PM UTC - **Commit**: bcdb000de284571bf5267aa3d052dee7918c1e6e - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][1] - **Microsoft.Private.Winforms**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC876ba0c&targetVersion=GCbcdb000&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCf316191&targetVersion=GC0ec02c8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Configuration.ConfigurationManager: from 6.0.0 to 6.0.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.8-servicing.22363.6 to 6.0.9-servicing.22412.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.8-servicing.22363.6 to 6.0.9-servicing.22412.2 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.8 to 6.0.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.8 to 6.0.9 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.8-servicing.22363.6 to 6.0.9-servicing.22412.2 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Configuration.ConfigurationManager: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.9-servicing.22412.2 to 6.0.9-servicing.22413.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.9-servicing.22412.2 to 6.0.9-servicing.22413.8 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.9-servicing.22412.2 to 6.0.9-servicing.22413.8 (parent: Microsoft.Private.Winforms) * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - System.Configuration.ConfigurationManager: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 6.0.9-servicing.22413.8 to 6.0.9-servicing.22415.4 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.9-servicing.22413.8 to 6.0.9-servicing.22415.4 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.9-servicing.22413.8 to 6.0.9-servicing.22415.4 (parent: Microsoft.Private.Winforms) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220816.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22415.17 -> To Version 6.0.9-servicing.22416.1 Dependency coherency updates System.Configuration.ConfigurationManager,System.Security.Cryptography.Xml,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms * Merged PR 25059: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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**: - **System.Configuration.ConfigurationManager**: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220817.1 - **Date Produced**: August 17, 2022 4:40:12 PM UTC - **Commit**: 5d275019237fbf9f4bf5d867f779c616ec264718 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.9-servicing.22416.1 to 6.0.9-servicing.22417.1][1] - **Microsoft.Private.Winforms**: [from 6.0.9-servicing.22416.1 to 6.0.9-servicing.22417.1][1] - **System.Configuration.ConfigurationManager**: [from 6.0.1 to 6.0.1][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.9][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22415.12 to 6.0.9-servicing.22416.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC491c3f4&targetVersion=GC5d27501&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCb114055&targetVersion=GCca2f175&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220818.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22417.1 -> To Version 6.0.9-servicing.22418.3 Dependency coherency updates System.Security.Cryptography.Xml From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220819.10 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.9-servicing.22418.3 -> To Version 6.0.9-servicing.22419.10 Dependency coherency updates System.Configuration.ConfigurationManager,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.1 -> To Version 6.0.1 (parent: Microsoft.Private.Winforms Co-authored-by: dotnet-bot Co-authored-by: DotNet Bot --- NuGet.config | 2 ++ eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..3af44f84032 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eacfa77875f..afbbe3f8a0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bcdb000de284571bf5267aa3d052dee7918c1e6e + ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 163a63591cf9e9b682063cf3995948c2b885a042 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 163a63591cf9e9b682063cf3995948c2b885a042 diff --git a/eng/Versions.props b/eng/Versions.props index 1c00ab9c638..60cc685da0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.8-servicing.22368.4 + 6.0.9-servicing.22419.10 5.0.0-alpha1.19562.1 - 6.0.8-servicing.22363.6 - 6.0.8-servicing.22363.6 + 6.0.9-servicing.22419.5 + 6.0.9-servicing.22419.5 - 6.0.8-servicing.22363.6 - 6.0.8 - 6.0.8 + 6.0.9-servicing.22419.5 + 6.0.9 + 6.0.9 6.0.5 6.0.0 6.0.0 @@ -47,7 +47,7 @@ 6.0.0 - 6.0.0 + 6.0.1 6.0.0 4.6.0-preview4.19176.11 6.0.1 From 6c656d57e2487a175007cb5c97eba10451bb2860 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 19:23:14 +0000 Subject: [PATCH 073/188] Update dependencies from https://github.com/dotnet/arcade build 20220913.7 (#7050) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- 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 +- .../templates/post-build/post-build.yml | 8 ++++---- global.json | 8 ++++---- 9 files changed, 26 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3af44f84032..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afbbe3f8a0a..8cb078d6012 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + 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/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e - + https://github.com/dotnet/arcade - 41323ecb0b2312980381bfdbb75afd2dae2b266b + 2fbe602d12256bf82de53791ddcbb964c1541b4e diff --git a/eng/Versions.props b/eng/Versions.props index 60cc685da0d..426070ac804 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22412.2 - 6.0.0-beta.22412.2 - 6.0.0-beta.22412.2 + 6.0.0-beta.22463.7 + 6.0.0-beta.22463.7 + 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 9ff6a10a682..aaeb83b4dcb 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 991ae05f5db..5b1b77d1c74 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 88f6f75a622..b6137f44ada 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 48918df740b..9c4becbc859 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 27060712681..fc022ca9b26 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 812f247a2cb..87ce92f066c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.108", + "dotnet": "6.0.109", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22412.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22463.7" }, "sdk": { - "version": "6.0.108" + "version": "6.0.109" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 54c6d6ae15c03ed7aef33ceb36d08aa0d0534ba6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 20:52:46 +0000 Subject: [PATCH 074/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220914.3 (#7051) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8cb078d6012..f5e83a8d2b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 2ff9f177d3c814a6682f22bc717c953079717585 + 6f20cdb7d0b352c1190f6844ddedeab8882404fa https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 426070ac804..066aedc4e60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22417.1 + 6.0.0-rtm.22464.3 From 2018ba64d1e6c211766bd7f824cb6f59eb79d701 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 19 Sep 2022 20:27:50 +0000 Subject: [PATCH 075/188] Merged PR 25793: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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**: - **System.Configuration.ConfigurationManager**: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.9-servicing.22451.7 to 6.0.10-servicing.22466.14 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.9-servicing.22451.7 to 6.0.10-servicing.22466.14 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22451.7 to 6.0.10-servicing.22466.14 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220919.3 - **Date Produced**: September 19, 2022 4:36:23 PM UTC - **Commit**: 84f55a42fcc741ba820caba861abf27aa84a4342 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22463.10 to 6.0.10-servicing.22469.3][4] - **Microsoft.Private.Winforms**: [from 6.0.10-servicing.22463.10 to 6.0.10-servicing.22469.3][4] - **System.Configuration.ConfigurationManager**: [from 6.0.1 to 6.0.1][5] - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][6] - **Microsoft.NETCore.ILDAsm**: [from 6.0.9-servicing.22451.7 to 6.0.10-servicing.22466.14][7] - **Microsoft.NETCore.ILAsm**: [from 6.0.9-servicing.22451.7 to 6.0.10-servicing.22466.14][7] - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][7] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][7] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22451.7 to 6.0.10-servicing.22466.14][7] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC05fbf93&targetVersion=GC84f55a4&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5e2d96c&targetVersion=GC163a635&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC0ec02c8&targetVersion=... --- NuGet.config | 2 ++ eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..51ba6be9aa4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f83ad2ab10..593b117ab89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 05fbf93f202984cf4e15591c0c9cfc14392f623d + 84f55a42fcc741ba820caba861abf27aa84a4342 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 05fbf93f202984cf4e15591c0c9cfc14392f623d + 84f55a42fcc741ba820caba861abf27aa84a4342 https://github.com/dotnet/runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 163a63591cf9e9b682063cf3995948c2b885a042 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 2768a7a7e73255a475206f30c4eb51f651b8cef8 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 2768a7a7e73255a475206f30c4eb51f651b8cef8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 2768a7a7e73255a475206f30c4eb51f651b8cef8 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 2768a7a7e73255a475206f30c4eb51f651b8cef8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 2768a7a7e73255a475206f30c4eb51f651b8cef8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 2768a7a7e73255a475206f30c4eb51f651b8cef8 diff --git a/eng/Versions.props b/eng/Versions.props index 05fe52af5ff..e4da3238fb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.10-servicing.22463.10 + 6.0.10-servicing.22469.3 5.0.0-alpha1.19562.1 - 6.0.9-servicing.22451.7 - 6.0.9-servicing.22451.7 + 6.0.10-servicing.22466.14 + 6.0.10-servicing.22466.14 - 6.0.9-servicing.22451.7 - 6.0.9 - 6.0.9 - 6.0.5 + 6.0.10-servicing.22466.14 + 6.0.10 + 6.0.10 + 6.0.6 6.0.0 6.0.0 6.0.0 From eb72ca4245601dbdc208ae3c547628fa71d3c5ce Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 19 Sep 2022 22:56:07 +0000 Subject: [PATCH 076/188] Merged PR 25966: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220919.5 - **Date Produced**: September 19, 2022 9:46:27 PM UTC - **Commit**: 33f516877d499c1a095702240a38bec64a57cb8a - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22469.3 to 6.0.10-servicing.22469.5][1] - **Microsoft.Private.Winforms**: [from 6.0.10-servicing.22469.3 to 6.0.10-servicing.22469.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC84f55a4&targetVersion=GC33f5168&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 593b117ab89..e162dff815e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 84f55a42fcc741ba820caba861abf27aa84a4342 + 33f516877d499c1a095702240a38bec64a57cb8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 84f55a42fcc741ba820caba861abf27aa84a4342 + 33f516877d499c1a095702240a38bec64a57cb8a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e4da3238fb4..4d334717807 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.10-servicing.22469.3 + 6.0.10-servicing.22469.5 From bbe6a9e6d0da0f80a57f80914177691fd1f1b97e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 16:33:50 +0000 Subject: [PATCH 077/188] Merged PR 25999: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.10-servicing.22466.14 to 6.0.10-servicing.22469.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.10-servicing.22466.14 to 6.0.10-servicing.22469.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22466.14 to 6.0.10-servicing.22469.10 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20220920.3 - **Date Produced**: September 20, 2022 3:36:03 PM UTC - **Commit**: 24d64ba63551a0f0457d62b834d043292d090815 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22469.5 to 6.0.10-servicing.22470.3][1] - **Microsoft.Private.Winforms**: [from 6.0.10-servicing.22469.5 to 6.0.10-servicing.22470.3][1] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.10-servicing.22466.14 to 6.0.10-servicing.22469.10][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.10-servicing.22466.14 to 6.0.10-servicing.22469.10][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22466.14 to 6.0.10-servicing.22469.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC33f5168&targetVersion=GC24d64ba&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2768a7a&targetVersion=GC3bd501a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51ba6be9aa4..756d44a49e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e162dff815e..c187df48182 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 33f516877d499c1a095702240a38bec64a57cb8a + 24d64ba63551a0f0457d62b834d043292d090815 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 33f516877d499c1a095702240a38bec64a57cb8a + 24d64ba63551a0f0457d62b834d043292d090815 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2768a7a7e73255a475206f30c4eb51f651b8cef8 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2768a7a7e73255a475206f30c4eb51f651b8cef8 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2768a7a7e73255a475206f30c4eb51f651b8cef8 + 3bd501a063af406167e0195844048a3c222afd29 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2768a7a7e73255a475206f30c4eb51f651b8cef8 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2768a7a7e73255a475206f30c4eb51f651b8cef8 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2768a7a7e73255a475206f30c4eb51f651b8cef8 + 3bd501a063af406167e0195844048a3c222afd29 diff --git a/eng/Versions.props b/eng/Versions.props index 4d334717807..eb3c883b870 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.10-servicing.22469.5 + 6.0.10-servicing.22470.3 5.0.0-alpha1.19562.1 - 6.0.10-servicing.22466.14 - 6.0.10-servicing.22466.14 + 6.0.10-servicing.22469.10 + 6.0.10-servicing.22469.10 - 6.0.10-servicing.22466.14 + 6.0.10-servicing.22469.10 6.0.10 6.0.10 6.0.6 From 31b38ebf332f0dd80bf808beb87351db2f3bc0ab Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 26 Sep 2022 23:37:52 +0000 Subject: [PATCH 078/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220926.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.10-servicing.22470.3 -> To Version 6.0.10-servicing.22476.6 Dependency coherency updates Microsoft.NETCore.Platforms,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.6 -> To Version 6.0.6 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 756d44a49e1..735c835da71 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c187df48182..da0dae92b72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24d64ba63551a0f0457d62b834d043292d090815 + 729cc7ccdec38bb23e6216a371293bb5ce738b5a https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 diff --git a/eng/Versions.props b/eng/Versions.props index eb3c883b870..269ce2ac744 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.10-servicing.22470.3 + 6.0.10-servicing.22476.6 5.0.0-alpha1.19562.1 - 6.0.10-servicing.22469.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 6.0.10 6.0.10 6.0.6 From 709af18cbabdd7300f4986fe8ac1eaad2994e57b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 19:10:46 +0000 Subject: [PATCH 079/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20221006.3 (#7167) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5e83a8d2b2..bd9553ca4e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6f20cdb7d0b352c1190f6844ddedeab8882404fa diff --git a/eng/Versions.props b/eng/Versions.props index 066aedc4e60..712b87387bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22464.3 + 6.0.0-rtm.22506.3 From 7ed707bbf1080ce939b0ded27161f7c3a6050e5d Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 6 Oct 2022 14:28:55 -0700 Subject: [PATCH 080/188] Update branding to 6.0.11 (#7157) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 712b87387bd..71269454770 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 10 + 11 $(MajorVersion).$(MinorVersion).$(PatchVersion) + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd9553ca4e0..16df2e4f3e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c + 729cc7ccdec38bb23e6216a371293bb5ce738b5a https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 diff --git a/eng/Versions.props b/eng/Versions.props index 71269454770..bd257760fce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.9-servicing.22419.10 + 6.0.10-servicing.22476.6 5.0.0-alpha1.19562.1 - 6.0.9-servicing.22419.5 - 6.0.9-servicing.22419.5 + 6.0.10-servicing.22476.5 + 6.0.10-servicing.22476.5 - 6.0.9-servicing.22419.5 - 6.0.9 - 6.0.9 - 6.0.5 + 6.0.10-servicing.22476.5 + 6.0.10 + 6.0.10 + 6.0.6 6.0.0 6.0.0 6.0.0 From 660bb1e1ebf1bc4abc7dbe001759b488d939d9cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 18:11:01 +0000 Subject: [PATCH 082/188] Update dependencies from https://github.com/dotnet/arcade build 20221012.3 (#7200) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/build.ps1 | 5 +++++ eng/common/init-tools-native.ps1 | 1 + global.json | 8 ++++---- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 735c835da71..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16df2e4f3e1..0d25fce843c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + bb1e72113a7eaf8bebda940beba8cf8bee1b453f diff --git a/eng/Versions.props b/eng/Versions.props index bd257760fce..259fcecb492 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22463.7 - 6.0.0-beta.22463.7 - 6.0.0-beta.22463.7 + 6.0.0-beta.22512.3 + 6.0.0-beta.22512.3 + 6.0.0-beta.22512.3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242f6..33a6f2d0e24 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 7428ef88084..6c7a851a808 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -112,6 +112,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 87ce92f066c..87bf003d34f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109", + "dotnet": "6.0.110", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22463.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22512.3" }, "sdk": { - "version": "6.0.109" + "version": "6.0.110" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From f65032b9caa6dd9403528c494c2087db280e1d7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 19:41:01 +0000 Subject: [PATCH 083/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20221013.2 (#7202) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d25fce843c..28e4cf9559f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 6f20cdb7d0b352c1190f6844ddedeab8882404fa + 70d61b78eea18c5dc837d4b6411b57dcee09b196 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 259fcecb492..df091bd6c33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22506.3 + 6.0.0-rtm.22513.2 From 8d60cc76ff0cd2bc37b145dcb5bff097f990844f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 16:44:57 +0000 Subject: [PATCH 084/188] Merged PR 26435: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221013.6 - **Date Produced**: October 13, 2022 7:16:48 PM UTC - **Commit**: b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][5] - **Microsoft.Private.Winforms**: [from 6.0.10-servicing.22476.6 to 6.0.11-servicing.22513.6][5] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC729cc7c&targetVersion=GCb7a706b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28e4cf9559f..65bf3d15d72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 729cc7ccdec38bb23e6216a371293bb5ce738b5a + b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 729cc7ccdec38bb23e6216a371293bb5ce738b5a + b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index df091bd6c33..f23469abb3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.10-servicing.22476.6 + 6.0.11-servicing.22513.6 From 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 20:32:25 +0000 Subject: [PATCH 085/188] Merged PR 26810: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.6 to 6.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.11 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221017.3 - **Date Produced**: October 17, 2022 6:35:27 PM UTC - **Commit**: 1821cb5860d45773816cb2f0c904e64581c6e465 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3][1] - **Microsoft.Private.Winforms**: [from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3][1] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.7][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.11][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.11][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.5 to 6.0.11-servicing.22514.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb7a706b&targetVersion=GC1821cb5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5a400c2&targetVersion=GCc672e90&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..59c7ea11f85 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65bf3d15d72..4f53f9db99a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 + 1821cb5860d45773816cb2f0c904e64581c6e465 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7a706b297c41ab4c3e5bdc5b72b70c1d25c9b92 + 1821cb5860d45773816cb2f0c904e64581c6e465 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 diff --git a/eng/Versions.props b/eng/Versions.props index f23469abb3d..398870392df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.11-servicing.22513.6 + 6.0.11-servicing.22517.3 5.0.0-alpha1.19562.1 - 6.0.10-servicing.22476.5 - 6.0.10-servicing.22476.5 + 6.0.11-servicing.22514.6 + 6.0.11-servicing.22514.6 - 6.0.10-servicing.22476.5 - 6.0.10 - 6.0.10 - 6.0.6 + 6.0.11-servicing.22514.6 + 6.0.11 + 6.0.11 + 6.0.7 6.0.0 6.0.0 6.0.0 From 37deaa02f76fc3b8df620e305b450b06fe2b685d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:03:59 +0000 Subject: [PATCH 086/188] Merged PR 26887: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221019.5 - **Date Produced**: October 19, 2022 2:59:44 PM UTC - **Commit**: 8ed3bcf52701282d7db3a99db2e7304bd4443c99 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][1] - **Microsoft.Private.Winforms**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1821cb5&targetVersion=GC8ed3bcf&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc672e90&targetVersion=GCaf5b37c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59c7ea11f85..800393f7f77 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f53f9db99a..eabc888aba5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1821cb5860d45773816cb2f0c904e64581c6e465 + 8ed3bcf52701282d7db3a99db2e7304bd4443c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1821cb5860d45773816cb2f0c904e64581c6e465 + 8ed3bcf52701282d7db3a99db2e7304bd4443c99 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde diff --git a/eng/Versions.props b/eng/Versions.props index 398870392df..5b2305121d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22519.5 5.0.0-alpha1.19562.1 - 6.0.11-servicing.22514.6 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 + 6.0.11-servicing.22518.9 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 6.0.11 6.0.11 6.0.7 From 96c5254e5ca5040021caf779216b1b3641875b1e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 23 Oct 2022 23:08:01 +0000 Subject: [PATCH 087/188] Merged PR 26994: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221023.4 - **Date Produced**: October 23, 2022 10:40:55 PM UTC - **Commit**: cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][1] - **Microsoft.Private.Winforms**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC8ed3bcf&targetVersion=GCcf9269e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 800393f7f77..f524bdf287f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eabc888aba5..7ba79f4ffe1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8ed3bcf52701282d7db3a99db2e7304bd4443c99 + cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8ed3bcf52701282d7db3a99db2e7304bd4443c99 + cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 diff --git a/eng/Versions.props b/eng/Versions.props index 5b2305121d5..7774ef49d55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.11-servicing.22519.5 + 6.0.11-servicing.22523.4 5.0.0-alpha1.19562.1 - 6.0.11-servicing.22518.9 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 6.0.11 6.0.11 6.0.7 From edc6538409703812e46d32a05bee165e04235a8e Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Sun, 30 Oct 2022 22:08:22 -0700 Subject: [PATCH 088/188] Switch to new images on release/6.0 (#7234) --- azure-pipelines.yml | 2 +- eng/pipeline.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ed87a495ae5..8c4f43a99f0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -73,7 +73,7 @@ stages: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre + demands: ImageOverride -equals windows.vs2019.amd64 # runAsPublic is used in expressions, which can't read from user-defined variables runAsPublic: false diff --git a/eng/pipeline.yml b/eng/pipeline.yml index a5f25fb8faf..128af17414d 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -35,10 +35,10 @@ jobs: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open + demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre + demands: ImageOverride -equals windows.vs2022preview.amd64 variables: # needed for signing - name: _TeamName From 77f6e0f2a8ed469a59e41e9b6fbe2add1094ea11 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 1 Nov 2022 21:53:24 -0700 Subject: [PATCH 089/188] Update branding to 6.0.12 (#7247) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index df091bd6c33..4f9789d99f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 11 + 12 $(MajorVersion).$(MinorVersion).$(PatchVersion) - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 + 6.0.0-beta.22558.2 + 6.0.0-beta.22558.2 + 6.0.0-beta.22558.2 diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 00000000000..648c5068d7d --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,38 @@ + +function Install-Gdn { + param( + [Parameter(Mandatory=$true)] + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 7b8ee18a28d..9dd5709f66d 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,28 @@ parameters: condition: '' steps: -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' -- task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} @@ -40,7 +39,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} @@ -62,7 +61,28 @@ steps: c i condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn artifact: GuardianConfiguration displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/global.json b/global.json index 87bf003d34f..8414839a627 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.110", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22512.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.2" }, "sdk": { - "version": "6.0.110" + "version": "6.0.111" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 68b183429e03540be3468250c86851a70db5686c Mon Sep 17 00:00:00 2001 From: Rishabh Chauhan <107022063+rchauhan18@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:04:06 +0530 Subject: [PATCH 092/188] Update Microsoft.Private.Winforms Version (#7269) Co-authored-by: Ashish Kumar Singh --- 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 b77d7221872..4eba7185dc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,11 +1,11 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 729cc7ccdec38bb23e6216a371293bb5ce738b5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 729cc7ccdec38bb23e6216a371293bb5ce738b5a From a58c6fb065b5310658ae7f67371b8bf3f93e9694 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Nov 2022 00:14:55 +0000 Subject: [PATCH 093/188] Update dependencies from https://github.com/dotnet/arcade build 20221108.7 (#7279) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/dotnet-install.sh | 4 ++-- global.json | 4 ++-- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index f524bdf287f..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75a7733a2c4..7b8c96d066f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 diff --git a/eng/Versions.props b/eng/Versions.props index cbc44e5c6a0..ccaa5bee9ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22558.2 - 6.0.0-beta.22558.2 - 6.0.0-beta.22558.2 + 6.0.0-beta.22558.7 + 6.0.0-beta.22558.7 + 6.0.0-beta.22558.7 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d..b09ea669f9c 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index 8414839a627..46d9ce8ec2d 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.7" }, "sdk": { "version": "6.0.111" From 901b10faef1e99c80fc96884f8b4e7fb50c0228c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 19:15:04 +0000 Subject: [PATCH 094/188] Update dependencies from https://github.com/dotnet/arcade build 20221110.1 (#7286) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b8c96d066f..d1990519e88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 diff --git a/eng/Versions.props b/eng/Versions.props index ccaa5bee9ce..a83360efe1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22558.7 - 6.0.0-beta.22558.7 - 6.0.0-beta.22558.7 + 6.0.0-beta.22560.1 + 6.0.0-beta.22560.1 + 6.0.0-beta.22560.1 diff --git a/global.json b/global.json index 46d9ce8ec2d..759fe5f7902 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22560.1" }, "sdk": { "version": "6.0.111" From 246bd9c3c1efd7668271d1fb0a6f0c2f51d87005 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 21:44:03 +0000 Subject: [PATCH 095/188] Update dependencies from https://github.com/dotnet/arcade build 20221111.1 (#7287) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1990519e88..3e96bd47e05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc diff --git a/eng/Versions.props b/eng/Versions.props index a83360efe1a..1c45b6538bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.22560.1 - 6.0.0-beta.22560.1 - 6.0.0-beta.22560.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 diff --git a/global.json b/global.json index 759fe5f7902..fafc34226ba 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22560.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22561.1" }, "sdk": { "version": "6.0.111" From ba2b8905441ad3f935e12bfbe6a88965b0ff32d1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 17 Nov 2022 18:08:30 +0000 Subject: [PATCH 096/188] Merged PR 27600: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221117.2 - **Date Produced**: November 17, 2022 4:27:14 PM UTC - **Commit**: d4da6f214495396a4ec18fd6ac34194d75f790d1 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.12-servicing.22554.4 to 6.0.12-servicing.22567.2][1] - **Microsoft.Private.Winforms**: [from 6.0.12-servicing.22554.4 to 6.0.12-servicing.22567.2][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.12][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.12][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCcf9269e&targetVersion=GCd4da6f2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC943474c&targetVersion=GC301f927&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..930e02842f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e96bd47e05..1547e722787 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + d4da6f214495396a4ec18fd6ac34194d75f790d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + d4da6f214495396a4ec18fd6ac34194d75f790d1 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 301f9272ad73bdc61612d730a910af914c64ab0e diff --git a/eng/Versions.props b/eng/Versions.props index 1c45b6538bc..4507aab596b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.11-servicing.22523.4 + 6.0.12-servicing.22567.2 5.0.0-alpha1.19562.1 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 + 6.0.12-servicing.22566.2 + 6.0.12-servicing.22566.2 - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11 + 6.0.12-servicing.22566.2 + 6.0.12 + 6.0.12 6.0.7 6.0.0 6.0.0 From 4178d795849932702f98b7f375f6341267510326 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 19 Nov 2022 17:30:30 +0000 Subject: [PATCH 097/188] Merged PR 27684: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221118.10 - **Date Produced**: November 19, 2022 1:01:34 AM UTC - **Commit**: bf70006b6e83a62167705431d633d1fd1ab49b34 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.12-servicing.22567.2 to 6.0.12-servicing.22568.10][1] - **Microsoft.Private.Winforms**: [from 6.0.12-servicing.22567.2 to 6.0.12-servicing.22568.10][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCd4da6f2&targetVersion=GCbf70006&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC301f927&targetVersion=GC02e45a4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 930e02842f6..b1b624c2072 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1547e722787..e49a0ac1679 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4da6f214495396a4ec18fd6ac34194d75f790d1 + bf70006b6e83a62167705431d633d1fd1ab49b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4da6f214495396a4ec18fd6ac34194d75f790d1 + bf70006b6e83a62167705431d633d1fd1ab49b34 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 diff --git a/eng/Versions.props b/eng/Versions.props index 4507aab596b..a0d20698419 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.12-servicing.22567.2 + 6.0.12-servicing.22568.10 5.0.0-alpha1.19562.1 - 6.0.12-servicing.22566.2 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 + 6.0.12-servicing.22568.7 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 6.0.12 6.0.12 6.0.7 From 6372ad36f932982e747a4dadd81d5cf3d2f12ca5 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 29 Nov 2022 12:18:04 -0800 Subject: [PATCH 098/188] Update branding to 6.0.13 (#7328) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1c45b6538bc..1abf17a8e7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 12 + 13 $(MajorVersion).$(MinorVersion).$(PatchVersion) + @@ -19,6 +20,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e49a0ac1679..a7564f2890e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf70006b6e83a62167705431d633d1fd1ab49b34 + bd7407606f49c7bb9ee784c5a5a9c19127c0f081 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bf70006b6e83a62167705431d633d1fd1ab49b34 + bd7407606f49c7bb9ee784c5a5a9c19127c0f081 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2f0b6a41f52..62ab9ed37b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.12-servicing.22568.10 + 6.0.13-servicing.22579.11 From 84b76d50665b8dde9881c6163bda00e3c3e1a8d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 1 Dec 2022 11:49:30 +0000 Subject: [PATCH 100/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20221201.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.13-servicing.22579.11 -> To Version 6.0.13-servicing.22601.1 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.12-servicing.22568.7 -> To Version 6.0.13-servicing.22580.9 (parent: Microsoft.Private.Winforms --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index da7b2801fee..79434d0c2da 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,7 @@ - - + @@ -20,8 +19,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7564f2890e..6445b0df270 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd7407606f49c7bb9ee784c5a5a9c19127c0f081 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd7407606f49c7bb9ee784c5a5a9c19127c0f081 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 diff --git a/eng/Versions.props b/eng/Versions.props index 62ab9ed37b6..f84d02e2c4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.13-servicing.22579.11 + 6.0.13-servicing.22601.1 5.0.0-alpha1.19562.1 - 6.0.12-servicing.22568.7 - 6.0.12-servicing.22568.7 + 6.0.13-servicing.22580.9 + 6.0.13-servicing.22580.9 - 6.0.12-servicing.22568.7 - 6.0.12 - 6.0.12 + 6.0.13-servicing.22580.9 + 6.0.13 + 6.0.13 6.0.7 6.0.0 6.0.0 From d39848dc247713b48c2545b04c929b422abef56a Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 4 Jan 2023 09:27:42 -0800 Subject: [PATCH 101/188] Update branding to 6.0.14 (#7411) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1abf17a8e7c..6ac8482a9bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 13 + 14 $(MajorVersion).$(MinorVersion).$(PatchVersion) - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 - 6.0.0-beta.22561.1 + 6.0.0-beta.23060.6 + 6.0.0-beta.23060.6 + 6.0.0-beta.23060.6 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ec8971eb019..51f30e53dd4 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcda4..b5b3e5aeb3b 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index fafc34226ba..02dbd81ad87 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.111", + "dotnet": "6.0.113", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22561.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23060.6" }, "sdk": { - "version": "6.0.111" + "version": "6.0.113" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 0c8bd9f06ea4cb47d75f1540983919f62d4fd182 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 12 Jan 2023 01:23:14 -0800 Subject: [PATCH 103/188] Merging internal commits for release/6.0 (#7434) * Change RestrictiveXamlXmlReader to use an allow list - Removes the old deny list logic used by RestrictiveXamlXmlReader - Provides an extensible (via registry) allow list mechanism Ported from release/7.0 branch. Fixes CVE-2022-41089. * Merged PR 27600: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.11 to 6.0.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221117.2 - **Date Produced**: November 17, 2022 4:27:14 PM UTC - **Commit**: d4da6f214495396a4ec18fd6ac34194d75f790d1 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.12-servicing.22554.4 to 6.0.12-servicing.22567.2][1] - **Microsoft.Private.Winforms**: [from 6.0.12-servicing.22554.4 to 6.0.12-servicing.22567.2][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.12][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.12][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22566.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCcf9269e&targetVersion=GCd4da6f2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC943474c&targetVersion=GC301f927&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 27684: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221118.10 - **Date Produced**: November 19, 2022 1:01:34 AM UTC - **Commit**: bf70006b6e83a62167705431d633d1fd1ab49b34 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.12-servicing.22567.2 to 6.0.12-servicing.22568.10][1] - **Microsoft.Private.Winforms**: [from 6.0.12-servicing.22567.2 to 6.0.12-servicing.22568.10][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCd4da6f2&targetVersion=GCbf70006&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC301f927&targetVersion=GC02e45a4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 27903: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20221129.11 - **Date Produced**: November 29, 2022 9:00:18 PM UTC - **Commit**: bd7407606f49c7bb9ee784c5a5a9c19127c0f081 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22579.11][1] - **Microsoft.Private.Winforms**: [from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22579.11][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbf70006&targetVersion=GCbd74076&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20221201.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.13-servicing.22579.11 -> To Version 6.0.13-servicing.22601.1 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.12-servicing.22568.7 -> To Version 6.0.13-servicing.22580.9 (parent: Microsoft.Private.Winforms Co-authored-by: dotnet-bot Co-authored-by: Levi Broderick Co-authored-by: DotNet Bot --- NuGet.config | 2 + eng/Version.Details.xml | 28 +- eng/Versions.props | 12 +- .../Markup/RestrictiveXamlXmlReader.cs | 249 ++++++++---------- 4 files changed, 131 insertions(+), 160 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..79434d0c2da 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cfe7f0f4dd..69a0a8ce5c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4 + 5a262a681e41941ea7ef42f49c0ed3b27a05c259 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 diff --git a/eng/Versions.props b/eng/Versions.props index b1f79507501..ac5e3035c3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.11-servicing.22523.4 + 6.0.13-servicing.22601.1 5.0.0-alpha1.19562.1 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 + 6.0.13-servicing.22580.9 + 6.0.13-servicing.22580.9 - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11 + 6.0.13-servicing.22580.9 + 6.0.13 + 6.0.13 6.0.7 6.0.0 6.0.0 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs index 81cd76fa282..7668a891566 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs @@ -2,58 +2,69 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -// -// Description: This class provides a XamlXmlReader implementation that skips over some known dangerous -// types when calling into the Read method, this is meant to prevent WpfXamlLoader from instantiating. +// +// Description: This class provides a XamlXmlReader implementation that implements an allow-list of legal +// types when calling into the Read method, meant to prevent instantiation of unexpected types. // -using System.Collections.Concurrent; +using Microsoft.Win32; using System.Collections.Generic; -using System.Reflection; using System.Xaml; using System.Xml; -using System.Security; namespace System.Windows.Markup { /// - /// Provides a XamlXmlReader implementation that that skips over some known dangerous types. + /// Provides a XamlXmlReader implementation that that implements an allow-list of legal types. /// internal class RestrictiveXamlXmlReader : System.Xaml.XamlXmlReader { - /// - /// The RestrictedTypes in the _restrictedTypes list do not initially contain a Type reference, we use a Type reference to determine whether an incoming Type can be assigned to that Type - /// in order to restrict it or allow it. We cannot get a Type reference without loading the assembly, so we need to first go through the loaded assemblies, and assign the Types - /// that are loaded. - /// - static RestrictiveXamlXmlReader() - { - _unloadedTypes = new ConcurrentDictionary>(); + private const string AllowedTypesForRestrictiveXamlContexts = @"SOFTWARE\Microsoft\.NETFramework\Windows Presentation Foundation\XPSAllowedTypes"; + private static readonly HashSet AllXamlNamespaces = new HashSet(XamlLanguage.XamlNamespaces); + private static readonly Type DependencyObjectType = typeof(System.Windows.DependencyObject); + private static readonly HashSet SafeTypesFromRegistry = ReadAllowedTypesForRestrictedXamlContexts(); - // Go through the list of restricted types and add each type under the matching assembly entry in the dictionary. - foreach (RestrictedType type in _restrictedTypes) + private static HashSet ReadAllowedTypesForRestrictedXamlContexts() + { + HashSet allowedTypesFromRegistry = new HashSet(); + try { - if (!String.IsNullOrEmpty(type.AssemblyName)) + // n.b. Registry64 uses the 32-bit registry in 32-bit operating systems. + // The registry key should have this format and is consistent across netfx & netcore: + // + // [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\Windows Presentation Foundation\XPSAllowedTypes] + // "SomeValue1"="Contoso.Controls.MyControl" + // "SomeValue2"="Fabrikam.Controls.MyOtherControl" + // ... + // + // The value names aren't important. The value data should match Type.FullName (including namespace but not assembly). + // If any value data is exactly "*", this serves as a global opt-out and allows everything through the system. + using (RegistryKey hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64)) { - if(!_unloadedTypes.ContainsKey(type.AssemblyName)) + if (hklm != null) { - _unloadedTypes[type.AssemblyName] = new List(); - } - - _unloadedTypes[type.AssemblyName].Add(type); - } - else - { - // If the RestrictedType entry does not provide an assembly name load it from PresentationFramework, - // this is the current assembly so it's already loaded, just get the Type and assign it to the RestrictedType entry - System.Type typeReference = System.Type.GetType(type.TypeName, false); - - if (typeReference != null) - { - type.TypeReference = typeReference; + using (RegistryKey xpsDangerKey = hklm.OpenSubKey(AllowedTypesForRestrictiveXamlContexts, false)) + { + if (xpsDangerKey != null) + { + foreach (string typeName in xpsDangerKey.GetValueNames()) + { + object value = xpsDangerKey.GetValue(typeName); + if (value != null) + { + allowedTypesFromRegistry.Add(value.ToString()); + } + } + } + } } } } + catch + { + // do nothing + } + return allowedTypesFromRegistry; } /// @@ -85,15 +96,15 @@ internal RestrictiveXamlXmlReader(XmlReader xmlReader, XamlSchemaContext schemaC /// public override bool Read() { - bool result = false; + bool result; int skippingDepth = 0; while (result = base.Read()) { if (skippingDepth <= 0) { - if (NodeType == System.Xaml.XamlNodeType.StartObject && - IsRestrictedType(Type.UnderlyingType)) + if ((NodeType == System.Xaml.XamlNodeType.StartObject && !IsAllowedType(Type.UnderlyingType)) || + (NodeType == System.Xaml.XamlNodeType.StartMember && Member is XamlDirective directive && !IsAllowedDirective(directive))) { skippingDepth = 1; } @@ -104,14 +115,18 @@ public override bool Read() } else { - if (NodeType == System.Xaml.XamlNodeType.StartObject || - NodeType == System.Xaml.XamlNodeType.GetObject) - { - skippingDepth += 1; - } - else if (NodeType == System.Xaml.XamlNodeType.EndObject) + switch (NodeType) { - skippingDepth -= 1; + case System.Xaml.XamlNodeType.StartObject: + case System.Xaml.XamlNodeType.StartMember: + case System.Xaml.XamlNodeType.GetObject: + skippingDepth += 1; + break; + + case System.Xaml.XamlNodeType.EndObject: + case System.Xaml.XamlNodeType.EndMember: + skippingDepth -= 1; + break; } } } @@ -120,128 +135,82 @@ public override bool Read() } /// - /// Determines whether an incoming type is either a restricted type or inheriting from one. + /// Determines whether an incoming directive is allowed. /// - private bool IsRestrictedType(Type type) + private bool IsAllowedDirective(XamlDirective directive) { - if (type != null) + // If the global opt-out switch is enabled, all directives are allowed. + if (SafeTypesFromRegistry.Contains("*")) { - // If an incoming type is already in the set we can just return false, we've verified this type is safe. - if (_safeTypesSet.Contains(type)) - { - return false; - } - - // Ensure that the restricted type list has the latest information for the assemblies currently loaded. - EnsureLatestAssemblyLoadInformation(); + return true; + } - // Iterate through our _restrictedTypes list, if an entry has a TypeReference then the type is loaded and we can check it. - foreach (RestrictedType restrictedType in _restrictedTypes) + // If this isn't a XAML directive, allow it through. + // This allows XML directives and other non-XAML directives through. + // This largely follows the logic at XamlMember.Equals, but we trigger for *any* + // overlapping namespace rather than requiring the namespace sets to match exactly. + bool isXamlDirective = false; + foreach (string xmlns in directive.GetXamlNamespaces()) + { + if (AllXamlNamespaces.Contains(xmlns)) { - if (restrictedType.TypeReference?.IsAssignableFrom(type) == true) - { - return true; - } + isXamlDirective = true; + break; } + } - // We've detected this type isn't nor inherits from a restricted type, add it to the safe types set. - _safeTypesSet.Add(type); + if (!isXamlDirective) + { + return true; + } + + // The following is an exhaustive list of all allowed XAML directives. + if (directive.Name == XamlLanguage.Items.Name || + directive.Name == XamlLanguage.Key.Name || + directive.Name == XamlLanguage.Name.Name) + { + return true; } + // This is a XAML directive but isn't in the allow-list; forbid it. return false; } /// - /// Iterates through the currently loaded assemblies and gets the Types for the assemblies we've marked as unloaded. - /// If our thread static assembly count is still the same we can skip this, we know no new assemblies have been loaded. + /// Determines whether an incoming type is present in the allow list. /// - private static void EnsureLatestAssemblyLoadInformation() + private bool IsAllowedType(Type type) { - Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); - - if (assemblies.Length != _loadedAssembliesCount) + // If the global opt-out switch is enabled, or if this type has been explicitly + // allow-listed (or is null, meaning this is a proxy which will be checked elsewhere), + // then it can come through. + if (type is null || SafeTypesFromRegistry.Contains("*") || _safeTypesSet.Contains(type) || SafeTypesFromRegistry.Contains(type.FullName)) { - foreach (Assembly assembly in assemblies) - { - RegisterAssembly(assembly); - } - - _loadedAssembliesCount = assemblies.Length; + return true; } - } + // We also have an implicit allow list which consists of: + // - primitives (int, etc.); and + // - any DependencyObject-derived type which exists in the System.Windows.* namespace. - /// - /// Get the Types from a newly loaded assembly and assign them in the RestrictedType list. - /// - private static void RegisterAssembly(Assembly assembly) - { - if (assembly != null) - { - string fullName = assembly.FullName; + bool isValidNamespace = type.Namespace != null && type.Namespace.StartsWith("System.Windows.", StringComparison.Ordinal); + bool isValidSubClass = type.IsSubclassOf(DependencyObjectType); + bool isValidPrimitive = type.IsPrimitive; - List types = null; - if (_unloadedTypes.TryGetValue(fullName, out types)) - { - if (types != null) - { - foreach (RestrictedType restrictedType in types) - { - Type typeInfo = assembly.GetType(restrictedType.TypeName, false); - restrictedType.TypeReference = typeInfo; - } - } - - _unloadedTypes.TryRemove(fullName, out types); - } + if (isValidPrimitive || (isValidNamespace && isValidSubClass)) + { + // Add it to the explicit allow list to make future lookups on this instance faster. + _safeTypesSet.Add(type); + return true; } + + // Otherwise, it didn't exist on any of our allow lists. + return false; } /// - /// Known dangerous types exploitable through XAML load. - /// - static List _restrictedTypes = new List() { - new RestrictedType("System.Windows.Data.ObjectDataProvider",""), - new RestrictedType("System.Windows.ResourceDictionary",""), - new RestrictedType("System.Configuration.Install.AssemblyInstaller","System.Configuration.Install, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), - new RestrictedType("System.Activities.Presentation.WorkflowDesigner","System.Activities.Presentation, Version = 4.0.0.0, Culture = neutral, PublicKeyToken = 31bf3856ad364e35"), - new RestrictedType("System.Windows.Forms.BindingSource","System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089") - }; - /// - /// Dictionary to keep track of known types that have not yet been loaded, the key is the assembly name. - /// Once an assembly is loaded we take the known types in that assembly, set the Type property in the RestrictedType entry, then remove the assembly entry. - /// - static ConcurrentDictionary> _unloadedTypes = null; - - /// - /// Per instance set of found restricted types, this is initialized to the known types that have been loaded, - /// if a type is found that is not already in the set and is assignable to a restricted type it is added. + /// Per instance set of allow-listed types, may grow at runtime to encompass implicit allow list. /// HashSet _safeTypesSet = new HashSet(); - - /// - /// Keeps track of the assembly count, if the assembly count is the same we avoid having to go through the loaded assemblies. - /// Once we get a Type in IsRestrictedType we are guaranteed to have already loaded it's assembly and base type assemblies,any other - /// assembly loads happening in other threads during our processing of IsRestrictedType do not affect our ability to check the Type properly. - /// - [ThreadStatic] private static int _loadedAssembliesCount; - - /// - /// Helper class to store type names. - /// - private class RestrictedType - { - public RestrictedType(string typeName, string assemblyName) - { - TypeName = typeName; - AssemblyName = assemblyName; - } - - public string TypeName { get; set; } - public string AssemblyName { get; set; } - public Type TypeReference { get; set; } - } } } - - From d40327ad15e6653d027e003749a3bf16fd603101 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 21 Jan 2023 01:04:08 +0000 Subject: [PATCH 104/188] Merged PR 28617: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230120.2 - **Date Produced**: January 20, 2023 11:38:52 PM UTC - **Commit**: 18f3f47e1880fa6cea7648845ea73c74cf7a9857 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2][4] - **Microsoft.Private.Winforms**: [from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2][4] - **System.DirectoryServices**: [from 6.0.0 to 6.0.1][5] - **Microsoft.NETCore.ILDAsm**: [from 6.0.13-servicing.22580.9 to 6.0.14-servicing.23070.4][6] - **Microsoft.NETCore.ILAsm**: [from 6.0.13-servicing.22580.9 to 6.0.14-servicing.23070.4][6] - **Microsoft.NETCore.App.Ref**: [from 6.0.13 to 6.0.14][6] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.13 to 6.0.14][6] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.13-servicing.22580.9 to 6.0.14-servicing.23070.4][6] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC5a262a6&targetVersion=GC18f3f47&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4822e3c&targetVersion=GC51b4c94&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1af80ba&targetVersion=GC51b4c94&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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**: - **System.DirectoryServices**: from 6.0.0 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.13-servicing.22580.9 to 6.0.14-servicing.23070.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.13-servicing.22580.9 to 6.0.14-servicing.23070.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.13 to 6.0.14 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.13 to 6.0.14 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.13-servicing.22580.9 to 6.0.14-servicing.23070.4 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 79434d0c2da..75dbee2eac0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69a0a8ce5c5..2ad6ca91d8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 18f3f47e1880fa6cea7648845ea73c74cf7a9857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 18f3f47e1880fa6cea7648845ea73c74cf7a9857 https://github.com/dotnet/runtime @@ -21,9 +21,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 diff --git a/eng/Versions.props b/eng/Versions.props index ac5e3035c3f..34db903ac5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,22 +26,22 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23070.2 5.0.0-alpha1.19562.1 - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 + 6.0.14-servicing.23070.4 + 6.0.14-servicing.23070.4 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23070.4 + 6.0.14 + 6.0.14 6.0.7 6.0.0 - 6.0.0 + 6.0.1 6.0.0 From 9e190e3d952203836d77bb0f1c42984524e1122d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:28:18 +0000 Subject: [PATCH 105/188] Merged PR 29133: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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**: - **System.DirectoryServices**: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230124.2 - **Date Produced**: January 24, 2023 3:49:40 PM UTC - **Commit**: 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][1] - **Microsoft.Private.Winforms**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][1] - **System.DirectoryServices**: [from 6.0.1 to 6.0.1][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC18f3f47&targetVersion=GC4bc32ea&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 75dbee2eac0..ae5ec38be69 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ad6ca91d8c..abce83eb4a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 https://github.com/dotnet/runtime @@ -23,7 +23,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a diff --git a/eng/Versions.props b/eng/Versions.props index 34db903ac5d..fed3684a568 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.2 5.0.0-alpha1.19562.1 - 6.0.14-servicing.23070.4 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 6.0.14 6.0.14 6.0.7 From 3ad7f4b8bc6ce1e8b62c7a522b6741243c777076 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Feb 2023 19:34:02 -0800 Subject: [PATCH 106/188] Update branding to 6.0.15 (#7511) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ac5e3035c3f..24bc2754be1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 14 + 15 $(MajorVersion).$(MinorVersion).$(PatchVersion) - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69a0a8ce5c5..abce83eb4a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 https://github.com/dotnet/runtime @@ -21,9 +21,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a diff --git a/eng/Versions.props b/eng/Versions.props index 24bc2754be1..e0ca49b61db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,22 +26,22 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23074.2 5.0.0-alpha1.19562.1 - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23073.9 + 6.0.14 + 6.0.14 6.0.7 6.0.0 - 6.0.0 + 6.0.1 6.0.0 From 29ab590e9d6596ecf0bd0092ec5c52582e81cf64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 18:17:42 +0000 Subject: [PATCH 108/188] Update dependencies from https://github.com/dotnet/arcade build 20230214.5 (#7539) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 8 ++++---- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index ae5ec38be69..cca9aaa7080 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + @@ -19,6 +20,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abce83eb4a7..cd0915e2a8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 diff --git a/eng/Versions.props b/eng/Versions.props index e0ca49b61db..6f23d0dcf64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23060.6 - 6.0.0-beta.23060.6 - 6.0.0-beta.23060.6 + 6.0.0-beta.23114.5 + 6.0.0-beta.23114.5 + 6.0.0-beta.23114.5 diff --git a/global.json b/global.json index 02dbd81ad87..3b292c3d8b8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.113", + "dotnet": "6.0.114", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23060.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23114.5" }, "sdk": { - "version": "6.0.113" + "version": "6.0.114" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From cb6e6bda2b0aa4ad545af7a8bf8674c52360231e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 17:47:13 +0000 Subject: [PATCH 109/188] Merged PR 29394: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230215.7 - **Date Produced**: February 15, 2023 7:44:42 PM UTC - **Commit**: 56544e31a1911ed5b7cc716c1b62d3862cc7442c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23115.7][3] - **Microsoft.Private.Winforms**: [from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23115.7][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4bc32ea&targetVersion=GC56544e3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd0915e2a8c..cd5f1f12888 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 56544e31a1911ed5b7cc716c1b62d3862cc7442c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 56544e31a1911ed5b7cc716c1b62d3862cc7442c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6f23d0dcf64..be19e6b25ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23115.7 From c68b021c8a031d8f1bf757dc16e44c10ed8c820e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 20:10:57 +0000 Subject: [PATCH 110/188] Merged PR 29712: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.7 to 6.0.8 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230217.2 - **Date Produced**: February 17, 2023 6:21:21 PM UTC - **Commit**: 1808f3abeb2af5809325c218ec752ab185df6678 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.15-servicing.23115.7 to 6.0.15-servicing.23117.2][1] - **Microsoft.Private.Winforms**: [from 6.0.15-servicing.23115.7 to 6.0.15-servicing.23117.2][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.8][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.15][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.15][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC56544e3&targetVersion=GC1808f3a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC943474c&targetVersion=GC5edef4b&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2a90daa&targetVersion=GC5edef4b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index cca9aaa7080..3b562967c64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,7 @@ - - + @@ -20,8 +19,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd5f1f12888..c65f2bb0315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 56544e31a1911ed5b7cc716c1b62d3862cc7442c + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 56544e31a1911ed5b7cc716c1b62d3862cc7442c + 1808f3abeb2af5809325c218ec752ab185df6678 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 diff --git a/eng/Versions.props b/eng/Versions.props index be19e6b25ee..7a6251f14a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.15-servicing.23115.7 + 6.0.15-servicing.23117.2 5.0.0-alpha1.19562.1 - 6.0.14-servicing.23073.9 - 6.0.14-servicing.23073.9 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 - 6.0.14-servicing.23073.9 - 6.0.14 - 6.0.14 - 6.0.7 + 6.0.15-servicing.23115.7 + 6.0.15 + 6.0.15 + 6.0.8 6.0.0 6.0.1 6.0.0 From 4d898d19e633e502bc821b7fbd7fdf3b42e6bd06 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 7 Mar 2023 19:20:04 -0800 Subject: [PATCH 111/188] Update branding to 6.0.16 (#7599) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6f23d0dcf64..3fa259a92ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 15 + 16 $(MajorVersion).$(MinorVersion).$(PatchVersion) - - + @@ -20,8 +19,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd0915e2a8c..c65f2bb0315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 diff --git a/eng/Versions.props b/eng/Versions.props index 3fa259a92ba..99e2d6e8ccc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23117.2 5.0.0-alpha1.19562.1 - 6.0.14-servicing.23073.9 - 6.0.14-servicing.23073.9 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 - 6.0.14-servicing.23073.9 - 6.0.14 - 6.0.14 - 6.0.7 + 6.0.15-servicing.23115.7 + 6.0.15 + 6.0.15 + 6.0.8 6.0.0 6.0.1 6.0.0 From 551c349e673f87ce8c5cf2a2ef413a6f76e6b632 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 08:22:45 +0000 Subject: [PATCH 114/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20230317.2 (#7632) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3b562967c64..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c65f2bb0315..b508c989eeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 70d61b78eea18c5dc837d4b6411b57dcee09b196 + f170d1bc4b8aa2456f093032bf821d84240ca069 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 99e2d6e8ccc..218ef2dcb57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.22513.2 + 6.0.0-rtm.23167.2 From fad46ee8a453bf984064f9226b93cf0e889c4a8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 11:04:46 +0000 Subject: [PATCH 115/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20230317.8 (#7635) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b508c989eeb..190e6539720 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - f170d1bc4b8aa2456f093032bf821d84240ca069 + 9ce4ee27262c83157471bfd93809b4c0c6ae780b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 218ef2dcb57..1c1ebfda0dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23167.2 + 6.0.0-rtm.23167.8 From 344f14f9b14b46112ed83b86b799324dc57a827f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 11:54:26 +0000 Subject: [PATCH 116/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20230317.10 (#7636) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 190e6539720..4b07deeee13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 9ce4ee27262c83157471bfd93809b4c0c6ae780b + 91f528ea1fe651eae7270c41ae5f908e4b849d7a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1c1ebfda0dd..85ad7f245a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23167.8 + 6.0.0-rtm.23167.10 From ece3eabeb6766d0c75a61a4964618e32888285ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 05:12:07 +0000 Subject: [PATCH 117/188] Update dependencies from https://github.com/dotnet/arcade build 20230315.1 (#7629) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b07deeee13..9116e39fffb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 diff --git a/eng/Versions.props b/eng/Versions.props index 85ad7f245a8..b693c4e7230 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 - 6.0.0-beta.23114.5 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 + 6.0.0-beta.23165.1 diff --git a/global.json b/global.json index 3b292c3d8b8..280e1408738 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.114", + "dotnet": "6.0.115", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23114.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23165.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23165.1" }, "sdk": { - "version": "6.0.114" + "version": "6.0.115" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 0c697d77c9dd78b38ec85a3d5ef8a4d24157b1c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 14:37:34 +0000 Subject: [PATCH 118/188] Update dependencies from https://github.com/dotnet/arcade build 20230317.1 (#7645) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9116e39fffb..67735c73e0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d diff --git a/eng/Versions.props b/eng/Versions.props index b693c4e7230..ce0efb7f074 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 - 6.0.0-beta.23165.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 + 6.0.0-beta.23167.1 diff --git a/global.json b/global.json index 280e1408738..22ea65adae5 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23165.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23165.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23167.1" }, "sdk": { "version": "6.0.115" From 0d16b7923d8a4aff69b9f203a682bf39dce91748 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 15:34:52 +0000 Subject: [PATCH 119/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20230320.2 (#7647) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67735c73e0f..e6436a78560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 91f528ea1fe651eae7270c41ae5f908e4b849d7a + a1a726df63819bb52a648826e1a7535e01456a8c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ce0efb7f074..6c89dc3e2b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23167.10 + 6.0.0-rtm.23170.2 From 52f78dde11b451241cc2f32463d9eee73462086a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 16:52:33 +0000 Subject: [PATCH 120/188] Merged PR 29878: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230320.2 - **Date Produced**: March 20, 2023 6:50:32 PM UTC - **Commit**: 91a592c75bd7dc31785fe1b23bfab0780a5bbbc7 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.15-servicing.23117.2 to 6.0.16-servicing.23170.2][4] - **Microsoft.Private.Winforms**: [from 6.0.15-servicing.23117.2 to 6.0.16-servicing.23170.2][4] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1808f3a&targetVersion=GC91a592c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6436a78560..41ccb04f7c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1808f3abeb2af5809325c218ec752ab185df6678 + 91a592c75bd7dc31785fe1b23bfab0780a5bbbc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1808f3abeb2af5809325c218ec752ab185df6678 + 91a592c75bd7dc31785fe1b23bfab0780a5bbbc7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6c89dc3e2b7..f41748f3560 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.15-servicing.23117.2 + 6.0.16-servicing.23170.2 From 6021156ac38d10eee9ca9d17553366352d3e8408 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 18:17:53 +0000 Subject: [PATCH 121/188] Merged PR 30127: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.8 to 6.0.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.15 to 6.0.16 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.16 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230321.2 - **Date Produced**: March 21, 2023 5:19:30 PM UTC - **Commit**: 02e4f4f5bc2d6027944d5144a3458bad23daa2ec - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23170.2 to 6.0.16-servicing.23171.2][1] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23170.2 to 6.0.16-servicing.23171.2][1] - **Microsoft.NETCore.Platforms**: [from 6.0.8 to 6.0.9][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.15 to 6.0.16][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC91a592c&targetVersion=GC02e4f4f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5edef4b&targetVersion=GC567ff53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..f59bba54fab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41ccb04f7c7..d2651518da8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 91a592c75bd7dc31785fe1b23bfab0780a5bbbc7 + 02e4f4f5bc2d6027944d5144a3458bad23daa2ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 91a592c75bd7dc31785fe1b23bfab0780a5bbbc7 + 02e4f4f5bc2d6027944d5144a3458bad23daa2ec https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 diff --git a/eng/Versions.props b/eng/Versions.props index f41748f3560..2f5c74d6b7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.16-servicing.23170.2 + 6.0.16-servicing.23171.2 5.0.0-alpha1.19562.1 - 6.0.15-servicing.23115.7 - 6.0.15-servicing.23115.7 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 - 6.0.15-servicing.23115.7 - 6.0.15 - 6.0.15 - 6.0.8 + 6.0.16-servicing.23170.9 + 6.0.16 + 6.0.16 + 6.0.9 6.0.0 6.0.1 6.0.0 From 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 16:13:44 +0000 Subject: [PATCH 122/188] Merged PR 30224: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230324.2 - **Date Produced**: March 24, 2023 8:43:27 PM UTC - **Commit**: 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2][1] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC02e4f4f5bc&targetVersion=GC357cdc523d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC567ff53ac7&targetVersion=GC1e620a42e7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index f59bba54fab..75db4751f24 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2651518da8..2ca29705a1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 02e4f4f5bc2d6027944d5144a3458bad23daa2ec + 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 02e4f4f5bc2d6027944d5144a3458bad23daa2ec + 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe diff --git a/eng/Versions.props b/eng/Versions.props index 2f5c74d6b7b..f9665df6387 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.16-servicing.23171.2 + 6.0.16-servicing.23174.2 5.0.0-alpha1.19562.1 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23173.11 + 6.0.16-servicing.23173.11 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23173.11 6.0.16 6.0.16 6.0.9 From 9a31848eca0dfb78cb6ff0131cbdc6522d05e353 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 4 Apr 2023 11:47:43 -0700 Subject: [PATCH 123/188] Update branding to 6.0.17 (#7695) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6c89dc3e2b7..42573642922 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 16 + 17 $(MajorVersion).$(MinorVersion).$(PatchVersion) + + @@ -19,6 +21,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ca29705a1d..ce89b5a3952 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 diff --git a/eng/Versions.props b/eng/Versions.props index 44d488d95fc..b5abbc37d16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23167.1 - 6.0.0-beta.23167.1 - 6.0.0-beta.23167.1 + 6.0.0-beta.23211.7 + 6.0.0-beta.23211.7 + 6.0.0-beta.23211.7 diff --git a/global.json b/global.json index 22ea65adae5..02978aa3f1a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.115", + "dotnet": "6.0.116", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23167.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23211.7" }, "sdk": { - "version": "6.0.115" + "version": "6.0.116" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From a0ae74e1eed68fcf68e9844e2e19519aee7a128c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:40:18 +0000 Subject: [PATCH 126/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20230412.3 (#7719) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce89b5a3952..aa9bc95339e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - a1a726df63819bb52a648826e1a7535e01456a8c + d3e9ed0d85f9dadf48486e2dce80aae55671c9c6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b5abbc37d16..a7f16f7199a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23170.2 + 6.0.0-rtm.23212.3 From 73865fc803bdadce4565ceff9d2b1cb067e9af6a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Apr 2023 18:34:23 +0000 Subject: [PATCH 127/188] Merged PR 30386: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230412.4 - **Date Produced**: April 12, 2023 6:20:51 PM UTC - **Commit**: 80a66e5fac1dbdd9604c201212bf2a866e3705ce - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC357cdc523d&targetVersion=GC80a66e5fac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa9bc95339e..9ff97a72ddb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 80a66e5fac1dbdd9604c201212bf2a866e3705ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 80a66e5fac1dbdd9604c201212bf2a866e3705ce https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a7f16f7199a..e34b3bdfbc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.16-servicing.23174.2 + 6.0.17-servicing.23212.4 From 0595f2eaaa1c0cdef5878f1989c6dc3c0110957b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 13 Apr 2023 21:11:50 +0000 Subject: [PATCH 128/188] Merged PR 30634: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230413.3 - **Date Produced**: April 13, 2023 7:00:15 PM UTC - **Commit**: 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC80a66e5fac&targetVersion=GC1960d9e6b9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCea0418c9be&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd50ad48aa4..44a04a0c44e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + @@ -24,6 +26,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ff97a72ddb..70bad4dfb55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 80a66e5fac1dbdd9604c201212bf2a866e3705ce + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 80a66e5fac1dbdd9604c201212bf2a866e3705ce + 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + ea0418c9be5fd59911882a59916c64fed035fb76 diff --git a/eng/Versions.props b/eng/Versions.props index e34b3bdfbc2..a57ce58c125 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.17-servicing.23212.4 + 6.0.17-servicing.23213.3 5.0.0-alpha1.19562.1 - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 + 6.0.17-servicing.23212.18 + 6.0.17-servicing.23212.18 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 + 6.0.17-servicing.23212.18 + 6.0.17 + 6.0.17 6.0.9 6.0.0 6.0.1 From cf237a039147d849a16e2a278b9db9f8fce6e424 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Apr 2023 17:19:53 +0000 Subject: [PATCH 129/188] Merged PR 30768: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230418.1 - **Date Produced**: April 18, 2023 3:25:39 PM UTC - **Commit**: 455077d161050f52799300d335ac47d53b6cfedb - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1960d9e6b9&targetVersion=GC455077d161&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCea0418c9be&targetVersion=GC6e89d2b65b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44a04a0c44e..5b840b984a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,11 +5,7 @@ - - - - - + @@ -23,11 +19,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70bad4dfb55..ed760337c13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 455077d161050f52799300d335ac47d53b6cfedb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 + 455077d161050f52799300d335ac47d53b6cfedb https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ea0418c9be5fd59911882a59916c64fed035fb76 + 6e89d2b65b0f8fc739d861077a2665e94d03d875 diff --git a/eng/Versions.props b/eng/Versions.props index a57ce58c125..e48060389be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.17-servicing.23213.3 + 6.0.17-servicing.23218.1 5.0.0-alpha1.19562.1 - 6.0.17-servicing.23212.18 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 + 6.0.17-servicing.23217.9 - 6.0.17-servicing.23212.18 + 6.0.17-servicing.23217.9 6.0.17 6.0.17 6.0.9 From 32a06007d08837761376e3739e2b59531204fe5d Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 3 May 2023 02:39:06 -0700 Subject: [PATCH 130/188] Update branding to 6.0.18 (#7789) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a7f16f7199a..33f4fbe7b27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 17 + 18 $(MajorVersion).$(MinorVersion).$(PatchVersion) - 6.0.17-servicing.23218.1 + 6.0.18-servicing.23252.5 From f82a2b2d304233b5e27a18fbc2ff65ede97e37eb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 May 2023 19:43:25 +0000 Subject: [PATCH 134/188] Merged PR 31347: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230518.4 - **Date Produced**: May 18, 2023 5:31:07 PM UTC - **Commit**: bac4e66c4abaf7e2a20990556b315f015cd518ca - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.18][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC24e3844434&targetVersion=GCbac4e66c4a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCe1d69ebd53&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e89d2b65b&targetVersion=GCe1d69ebd53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5b840b984a8..35af82ab569 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83758045e70..6e33ed10259 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24e38444348603b9b97149b5e3ffb73f7baddc85 + bac4e66c4abaf7e2a20990556b315f015cd518ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24e38444348603b9b97149b5e3ffb73f7baddc85 + bac4e66c4abaf7e2a20990556b315f015cd518ca https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6e89d2b65b0f8fc739d861077a2665e94d03d875 + e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 diff --git a/eng/Versions.props b/eng/Versions.props index 33197bcc0bd..b3ab14e832f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.18-servicing.23252.5 + 6.0.18-servicing.23268.4 5.0.0-alpha1.19562.1 - 6.0.17-servicing.23217.9 - 6.0.17-servicing.23217.9 + 6.0.18-servicing.23266.17 + 6.0.18-servicing.23266.17 - 6.0.17-servicing.23217.9 - 6.0.17 - 6.0.17 - 6.0.9 + 6.0.18-servicing.23266.17 + 6.0.18 + 6.0.18 + 6.0.10 6.0.0 6.0.1 6.0.0 From 7cd35b1648ac297ea6404c1f7645aaae8a216938 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:24:06 +0000 Subject: [PATCH 135/188] Merged PR 31380: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230518.8 - **Date Produced**: May 19, 2023 4:46:19 PM UTC - **Commit**: 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][4] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbac4e66c4a&targetVersion=GC9e5f193ed6&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe1d69ebd53&targetVersion=GC01f26a7417&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 35af82ab569..2e3aa0ef666 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e33ed10259..ee749f18a6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bac4e66c4abaf7e2a20990556b315f015cd518ca + 9e5f193ed61f002d5d870df9c8b0b5e880fa595c https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1d69ebd53813a4e3c1e2d9154dd4ac42dd1e0a0 + 01f26a741717461d8a311f4a1ee72e64565172aa diff --git a/eng/Versions.props b/eng/Versions.props index b3ab14e832f..0db1e7872b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.18-servicing.23268.4 + 6.0.18-servicing.23268.8 5.0.0-alpha1.19562.1 - 6.0.18-servicing.23266.17 - 6.0.18-servicing.23266.17 + 6.0.18-servicing.23268.3 + 6.0.18-servicing.23268.3 - 6.0.18-servicing.23266.17 + 6.0.18-servicing.23268.3 6.0.18 6.0.18 6.0.10 From a29a62bc7aa91d9e7509261a138af3c27c0506ea Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 May 2023 15:27:40 +0000 Subject: [PATCH 136/188] Merged PR 31444: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230522.1 - **Date Produced**: May 22, 2023 2:50:17 PM UTC - **Commit**: 865895cec5e8dc357b65c98a4a7af58643d10997 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC9e5f193ed6&targetVersion=GC865895cec5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC01f26a7417&targetVersion=GCc76ac56549&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2e3aa0ef666..06be4fb0ffd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee749f18a6b..c487a450fe5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 9e5f193ed61f002d5d870df9c8b0b5e880fa595c + 865895cec5e8dc357b65c98a4a7af58643d10997 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f26a741717461d8a311f4a1ee72e64565172aa + c76ac565499f3e7c657126d46c00b67a0d74832c diff --git a/eng/Versions.props b/eng/Versions.props index 0db1e7872b2..0018b6b95fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.18-servicing.23268.8 + 6.0.18-servicing.23272.1 5.0.0-alpha1.19562.1 - 6.0.18-servicing.23268.3 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 - 6.0.18-servicing.23268.3 + 6.0.18-servicing.23269.7 6.0.18 6.0.18 6.0.10 From 3472e2aa5eb9c204a775dc42d02151c813812b50 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Jun 2023 22:24:27 -0700 Subject: [PATCH 137/188] Update branding to 6.0.19 (#7900) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 33f4fbe7b27..85c1eac372b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 18 + 19 $(MajorVersion).$(MinorVersion).$(PatchVersion) + + @@ -19,6 +21,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c487a450fe5..13ee344f702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + fa4408a6fb58f06ac3db723e56bf16f3af7315d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + fa4408a6fb58f06ac3db723e56bf16f3af7315d5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d2720ed04fc..cd8b3e5a38a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.18-servicing.23272.1 + 6.0.19-servicing.23313.5 From c758542e58474353d4ef53b720d13dae0748978d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Jun 2023 01:36:27 +0000 Subject: [PATCH 139/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230613.12 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.12 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13ee344f702..3bd27db2dc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fa4408a6fb58f06ac3db723e56bf16f3af7315d5 + 7c8195afbf8f45bca27b107df1650daf9023cd7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fa4408a6fb58f06ac3db723e56bf16f3af7315d5 + 7c8195afbf8f45bca27b107df1650daf9023cd7a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cd8b3e5a38a..73621d92618 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.19-servicing.23313.5 + 6.0.19-servicing.23313.12 From 24536f3646d4a44f0a636b43664f14f97aeea48b Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 13 Jun 2023 22:44:55 -0700 Subject: [PATCH 140/188] Merging internal commits for release/6.0 (#7920) * Merged PR 30328: WPF MSRC Fix port for CVE-2023-24895 WPF MSRC Fix port for CVE-2023-24895 * Merged PR 30386: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230412.4 - **Date Produced**: April 12, 2023 6:20:51 PM UTC - **Commit**: 80a66e5fac1dbdd9604c201212bf2a866e3705ce - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC357cdc523d&targetVersion=GC80a66e5fac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 30634: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230413.3 - **Date Produced**: April 13, 2023 7:00:15 PM UTC - **Commit**: 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC80a66e5fac&targetVersion=GC1960d9e6b9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCea0418c9be&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 30768: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230418.1 - **Date Produced**: April 18, 2023 3:25:39 PM UTC - **Commit**: 455077d161050f52799300d335ac47d53b6cfedb - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1960d9e6b9&targetVersion=GC455077d161&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCea0418c9be&targetVersion=GC6e89d2b65b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31016: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230502.5 - **Date Produced**: May 2, 2023 6:56:09 PM UTC - **Commit**: 24e38444348603b9b97149b5e3ffb73f7baddc85 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC455077d161&targetVersion=GC24e3844434&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31347: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230518.4 - **Date Produced**: May 18, 2023 5:31:07 PM UTC - **Commit**: bac4e66c4abaf7e2a20990556b315f015cd518ca - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.18][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC24e3844434&targetVersion=GCbac4e66c4a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCe1d69ebd53&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e89d2b65b&targetVersion=GCe1d69ebd53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31380: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230518.8 - **Date Produced**: May 19, 2023 4:46:19 PM UTC - **Commit**: 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][4] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbac4e66c4a&targetVersion=GC9e5f193ed6&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe1d69ebd53&targetVersion=GC01f26a7417&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31444: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230522.1 - **Date Produced**: May 22, 2023 2:50:17 PM UTC - **Commit**: 865895cec5e8dc357b65c98a4a7af58643d10997 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC9e5f193ed6&targetVersion=GC865895cec5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC01f26a7417&targetVersion=GCc76ac56549&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --------- Co-authored-by: dotnet-bot Co-authored-by: Ashish Singh Co-authored-by: DotNet Bot --- NuGet.config | 8 +--- eng/Version.Details.xml | 32 ++++++++-------- eng/Versions.props | 14 +++---- .../AppModel/AppModelKnownContentFactory.cs | 37 ++++++++++++++++--- .../MS/Internal/AppModel/MimeObjectFactory.cs | 25 ++++++++++--- .../System/Windows/Application.cs | 24 ++++++------ .../System/Windows/Markup/ParserContext.cs | 1 + .../Markup/RestrictiveXamlXmlReader.cs | 24 ++++++++++-- .../System/Windows/Markup/WpfXamlLoader.cs | 17 +++++++++ .../System/Windows/Markup/XamlReader.cs | 8 ++-- .../Windows/Navigation/NavigationService.cs | 6 ++- .../System/Windows/ResourceDictionary.cs | 6 ++- 12 files changed, 140 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd50ad48aa4..06be4fb0ffd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,7 @@ - - - + @@ -21,9 +19,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa9bc95339e..c487a450fe5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 865895cec5e8dc357b65c98a4a7af58643d10997 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d + 865895cec5e8dc357b65c98a4a7af58643d10997 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e620a42e71ca8c7efb033fd525f04be5fa701fe + c76ac565499f3e7c657126d46c00b67a0d74832c diff --git a/eng/Versions.props b/eng/Versions.props index 85c1eac372b..d2720ed04fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.16-servicing.23174.2 + 6.0.18-servicing.23272.1 5.0.0-alpha1.19562.1 - 6.0.16-servicing.23173.11 - 6.0.16-servicing.23173.11 + 6.0.18-servicing.23269.7 + 6.0.18-servicing.23269.7 - 6.0.16-servicing.23173.11 - 6.0.16 - 6.0.16 - 6.0.9 + 6.0.18-servicing.23269.7 + 6.0.18 + 6.0.18 + 6.0.10 6.0.0 6.0.1 6.0.0 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs index 17faf771842..4b89168c0f6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs @@ -9,7 +9,7 @@ using System; using System.IO; -using System.Security; +using System.Security; using System.Windows; using System.Windows.Markup; using System.Windows.Navigation; @@ -33,8 +33,16 @@ internal static class AppModelKnownContentFactory // internal static object BamlConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter) { - asyncObjectConverter = null; + return BamlConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false); + } + internal static object BamlConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) + { + asyncObjectConverter = null; + if (isUnsafe) + { + throw new InvalidOperationException(SR.Get(SRID.BamlIsNotSupportedOutsideOfApplicationResources)); + } // If this stream comes from outside the application throw // if (!BaseUriHelper.IsPackApplicationUri(baseUri)) @@ -63,6 +71,11 @@ internal static object BamlConverter(Stream stream, Uri baseUri, bool canUseTopL // Creates an object instance from a Xaml stream and it's Uri // internal static object XamlConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter) + { + return XamlConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false); + } + + internal static object XamlConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) { asyncObjectConverter = null; @@ -91,18 +104,22 @@ internal static object XamlConverter(Stream stream, Uri baseUri, bool canUseTopL XamlReader xr = new XamlReader(); asyncObjectConverter = xr; xr.LoadCompleted += new AsyncCompletedEventHandler(OnParserComplete); + if(isUnsafe) + { + pc.FromRestrictiveReader = true; + } // XamlReader.Load will close the stream. return xr.LoadAsync(stream, pc); } else { // XamlReader.Load will close the stream. - return XamlReader.Load(stream, pc); + return XamlReader.Load(stream, pc, isUnsafe); } } } - private static void OnParserComplete(object sender, AsyncCompletedEventArgs args) + private static void OnParserComplete(object sender, AsyncCompletedEventArgs args) { // We can get this event from cancellation. We do not care about the error if there is any // that happened as a result of cancellation. @@ -114,13 +131,21 @@ private static void OnParserComplete(object sender, AsyncCompletedEventArgs args internal static object HtmlXappConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter) { - asyncObjectConverter = null; + return HtmlXappConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false); + } + internal static object HtmlXappConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) + { + asyncObjectConverter = null; + if (isUnsafe) + { + throw new InvalidOperationException(SR.Get(SRID.BamlIsNotSupportedOutsideOfApplicationResources)); + } if (canUseTopLevelBrowser) { return null; } - + if (SecurityHelper.AreStringTypesEqual(baseUri.Scheme, BaseUriHelper.PackAppBaseUri.Scheme)) { baseUri = BaseUriHelper.ConvertPackUriToAbsoluteExternallyVisibleUri(baseUri); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs index 0251869cd00..cdcc8aad3c9 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs @@ -20,6 +20,7 @@ namespace MS.Internal.AppModel { internal delegate object StreamToObjectFactoryDelegate(Stream s, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter); + internal delegate object StreamToObjectFactoryDelegateCore(Stream s, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe); internal static class MimeObjectFactory { @@ -33,26 +34,37 @@ internal static class MimeObjectFactory // The delegate that we are calling is responsible for closing the stream internal static object GetObjectAndCloseStream(Stream s, ContentType contentType, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter) + { + return GetObjectAndCloseStreamCore(s, contentType, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false); + } + + internal static object GetObjectAndCloseStreamCore(Stream s, ContentType contentType, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) { object objToReturn = null; asyncObjectConverter = null; if (contentType != null) { - StreamToObjectFactoryDelegate d; - if (_objectConverters.TryGetValue(contentType, out d)) + StreamToObjectFactoryDelegateCore d; + if (_objectConvertersCore.TryGetValue(contentType, out d)) { - objToReturn = d(s, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter); + objToReturn = d(s, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, isUnsafe); } } return objToReturn; } - + // The delegate registered here will be responsible for closing the stream passed to it. + internal static void RegisterCore(ContentType contentType, StreamToObjectFactoryDelegateCore method) + { + _objectConvertersCore[contentType] = method; + } + // The delegate registered here will be responsible for closing the stream passed to it. internal static void Register(ContentType contentType, StreamToObjectFactoryDelegate method) { - _objectConverters[contentType] = method; + StreamToObjectFactoryDelegateCore methodCore = new StreamToObjectFactoryDelegateCore((Stream s, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe) => method(s, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter)); + RegisterCore(contentType, methodCore); } #endregion @@ -66,7 +78,8 @@ internal static void Register(ContentType contentType, StreamToObjectFactoryDele #region private members - private static readonly Dictionary _objectConverters = new Dictionary(capacity: 9, new ContentType.WeakComparer()); + private static readonly Dictionary _objectConverters = new Dictionary(9, new ContentType.WeakComparer()); + private static readonly Dictionary _objectConvertersCore = new Dictionary(9, new ContentType.WeakComparer()); #endregion } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs index 275a575c0d7..f7de153b642 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs @@ -1979,20 +1979,22 @@ private static void ApplicationInit() // and mark it as thread-safe so PackWebResponse won't protect returned streams with a synchronizing wrapper PreloadedPackages.AddPackage(PackUriHelper.GetPackageUri(BaseUriHelper.PackAppBaseUri), new ResourceContainer(), true); - MimeObjectFactory.Register(MimeTypeMapper.BamlMime, new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.BamlConverter)); - StreamToObjectFactoryDelegate xamlFactoryDelegate = new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.XamlConverter); + MimeObjectFactory.RegisterCore(MimeTypeMapper.BamlMime, new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.BamlConverterCore)); - MimeObjectFactory.Register(MimeTypeMapper.XamlMime, xamlFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.FixedDocumentMime, xamlFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.FixedDocumentSequenceMime, xamlFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.FixedPageMime, xamlFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.ResourceDictionaryMime, xamlFactoryDelegate); + StreamToObjectFactoryDelegateCore xamlFactoryDelegate = new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.XamlConverterCore); - StreamToObjectFactoryDelegate htmlxappFactoryDelegate = new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.HtmlXappConverter); - MimeObjectFactory.Register(MimeTypeMapper.HtmMime, htmlxappFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.HtmlMime, htmlxappFactoryDelegate); - MimeObjectFactory.Register(MimeTypeMapper.XbapMime, htmlxappFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.XamlMime, xamlFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedDocumentMime, xamlFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedDocumentSequenceMime, xamlFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedPageMime, xamlFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.ResourceDictionaryMime, xamlFactoryDelegate); + + StreamToObjectFactoryDelegateCore htmlxappFactoryDelegate = new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.HtmlXappConverterCore); + MimeObjectFactory.RegisterCore(MimeTypeMapper.HtmMime, htmlxappFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.HtmlMime, htmlxappFactoryDelegate); + MimeObjectFactory.RegisterCore(MimeTypeMapper.XbapMime, htmlxappFactoryDelegate); + } // This function returns the resource stream including resource and content file. diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs index 788cd569951..863cb98e0a2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs @@ -475,6 +475,7 @@ public static XmlParserContext ToXmlParserContext(ParserContext parserContext) #region Internal + internal bool FromRestrictiveReader { get; set; } // Reset stack to default state private void EndRepeat() diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs index 7668a891566..2ad86375d6e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/RestrictiveXamlXmlReader.cs @@ -167,7 +167,8 @@ private bool IsAllowedDirective(XamlDirective directive) // The following is an exhaustive list of all allowed XAML directives. if (directive.Name == XamlLanguage.Items.Name || directive.Name == XamlLanguage.Key.Name || - directive.Name == XamlLanguage.Name.Name) + directive.Name == XamlLanguage.Name.Name || + Member == XamlLanguage.PositionalParameters) { return true; } @@ -193,7 +194,7 @@ private bool IsAllowedType(Type type) // - primitives (int, etc.); and // - any DependencyObject-derived type which exists in the System.Windows.* namespace. - bool isValidNamespace = type.Namespace != null && type.Namespace.StartsWith("System.Windows.", StringComparison.Ordinal); + bool isValidNamespace = type.Namespace != null && (type.Namespace.Equals("System.Windows", StringComparison.Ordinal) || type.Namespace.StartsWith("System.Windows.", StringComparison.Ordinal)); bool isValidSubClass = type.IsSubclassOf(DependencyObjectType); bool isValidPrimitive = type.IsPrimitive; @@ -211,6 +212,23 @@ private bool IsAllowedType(Type type) /// /// Per instance set of allow-listed types, may grow at runtime to encompass implicit allow list. /// - HashSet _safeTypesSet = new HashSet(); + HashSet _safeTypesSet = new HashSet() { + typeof(System.Windows.ResourceDictionary), + typeof(System.Windows.StaticResourceExtension), + typeof(System.Windows.Documents.DocumentStructures.FigureStructure), + typeof(System.Windows.Documents.DocumentStructures.ListItemStructure), + typeof(System.Windows.Documents.DocumentStructures.ListStructure), + typeof(System.Windows.Documents.DocumentStructures.NamedElement), + typeof(System.Windows.Documents.DocumentStructures.ParagraphStructure), + typeof(System.Windows.Documents.DocumentStructures.SectionStructure), + typeof(System.Windows.Documents.DocumentStructures.StoryBreak), + typeof(System.Windows.Documents.DocumentStructures.StoryFragment), + typeof(System.Windows.Documents.DocumentStructures.StoryFragments), + typeof(System.Windows.Documents.DocumentStructures.TableCellStructure), + typeof(System.Windows.Documents.DocumentStructures.TableRowGroupStructure), + typeof(System.Windows.Documents.DocumentStructures.TableRowStructure), + typeof(System.Windows.Documents.DocumentStructures.TableStructure), + typeof(System.Windows.Documents.LinkTarget) + }; } } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/WpfXamlLoader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/WpfXamlLoader.cs index 29cfb380eb5..493006de594 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/WpfXamlLoader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/WpfXamlLoader.cs @@ -116,6 +116,23 @@ private static object Load(System.Xaml.XamlReader xamlReader, IXamlObjectWriterF } stack.CurrentFrame.Instance = args.Instance; + + if (xamlReader is RestrictiveXamlXmlReader && args != null) + { + if (args.Instance is System.Windows.ResourceDictionary rd) + { + rd.IsUnsafe = true; + } + else if (args.Instance is System.Windows.Controls.Frame frame) + { + frame.NavigationService.IsUnsafe = true; + } + else if (args.Instance is System.Windows.Navigation.NavigationWindow nw) + { + nw.NavigationService.IsUnsafe = true; + } + } + }; if (writerFactory != null) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs index a9ba35f0d2a..6c4c0feb357 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReader.cs @@ -183,7 +183,7 @@ public static object Load(Stream stream, ParserContext parserContext, bool useRe } XmlReader reader = XmlReader.Create(stream, null, parserContext); - object tree = Load(reader, parserContext, XamlParseMode.Synchronous, useRestrictiveXamlReader); + object tree = Load(reader, parserContext, XamlParseMode.Synchronous, useRestrictiveXamlReader || parserContext.FromRestrictiveReader); stream.Close(); return tree; } @@ -378,8 +378,8 @@ private object LoadAsync(XmlReader reader, ParserContext parserContext, bool use try { - _textReader = (useRestrictiveXamlReader) ? new RestrictiveXamlXmlReader(reader, schemaContext, settings) : - new System.Xaml.XamlXmlReader(reader, schemaContext, settings); + _textReader = (useRestrictiveXamlReader || parserContext.FromRestrictiveReader) ? new RestrictiveXamlXmlReader(reader, schemaContext, settings) : + new System.Xaml.XamlXmlReader(reader, schemaContext, settings); _stack = new XamlContextStack(() => new WpfXamlFrame()); @@ -917,7 +917,7 @@ internal static object Load( XamlSchemaContext schemaContext = parserContext.XamlTypeMapper != null ? parserContext.XamlTypeMapper.SchemaContext : GetWpfSchemaContext(); - System.Xaml.XamlXmlReader xamlXmlReader = (useRestrictiveXamlReader) ? new RestrictiveXamlXmlReader(reader, schemaContext, settings, safeTypes) : + System.Xaml.XamlXmlReader xamlXmlReader = (useRestrictiveXamlReader || parserContext.FromRestrictiveReader) ? new RestrictiveXamlXmlReader(reader, schemaContext, settings, safeTypes) : new System.Xaml.XamlXmlReader(reader, schemaContext, settings); root = Load(xamlXmlReader, parserContext); reader.Close(); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/NavigationService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/NavigationService.cs index 291f360a38f..ee1666eafa8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/NavigationService.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/NavigationService.cs @@ -2945,7 +2945,7 @@ private void GetObjectFromResponse(WebRequest request, WebResponse response, Uri // o will be null. // We don't support browser hosting since .NET Core 3.0, so therefore canUseTopLevelBrowserForHTMLRendering = false bool canUseTopLevelBrowserForHTMLRendering = false; - Object o = MimeObjectFactory.GetObjectAndCloseStream(bindStream, contentType, destinationUri, canUseTopLevelBrowserForHTMLRendering, sandBoxContent, true /*allowAsync*/, IsJournalNavigation(navigateInfo), out _asyncObjectConverter); + Object o = MimeObjectFactory.GetObjectAndCloseStreamCore(bindStream, contentType, destinationUri, canUseTopLevelBrowserForHTMLRendering, sandBoxContent, true /*allowAsync*/, IsJournalNavigation(navigateInfo), out _asyncObjectConverter, IsUnsafe); if (o != null) { @@ -3640,7 +3640,9 @@ internal void Dispose() _parentNavigationService = null; _webBrowser = null; } - + + // This is set when the navigationservice is loaded from unsafe xps doc. + internal bool IsUnsafe { get; set; } #region Private Functions /// diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs index 46fd97441f5..e44645e55d0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs @@ -112,6 +112,9 @@ private void CopyToWithoutLock(DictionaryEntry[] array, int arrayIndex) entry.Value = value; // refresh the entry value in case it was changed in the previous call } } + + // This is set when the RD is loaded from unsafe xps doc. This will be checked while creating reader for RD source. + internal bool IsUnsafe { get; set; } /// /// List of ResourceDictionaries merged into this Resource Dictionary @@ -226,7 +229,7 @@ public Uri Source // It can be a sync/async converter. It's the converter's responsiblity to close the stream. // If it fails to find a convert, this call will return null. System.Windows.Markup.XamlReader asyncObjectConverter; - ResourceDictionary loadedRD = MimeObjectFactory.GetObjectAndCloseStream(s, contentType, uri, false, false, false /*allowAsync*/, false /*isJournalNavigation*/, out asyncObjectConverter) + ResourceDictionary loadedRD = MimeObjectFactory.GetObjectAndCloseStreamCore(s, contentType, uri, false, false, false /*allowAsync*/, false /*isJournalNavigation*/, out asyncObjectConverter, IsUnsafe) as ResourceDictionary; if (loadedRD == null) @@ -2467,6 +2470,7 @@ private void CopyDeferredContentFrom(ResourceDictionary loadedRD) _reader = loadedRD._reader; _numDefer = loadedRD._numDefer; _deferredLocationList = loadedRD._deferredLocationList; + IsUnsafe = loadedRD.IsUnsafe; } private void MoveDeferredResourceReferencesFrom(ResourceDictionary loadedRD) From c981e03be84865075f64145a69e683cb66401cc8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Jun 2023 21:02:22 +0000 Subject: [PATCH 141/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230614.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23314.6 Dependency coherency updates Microsoft.NETCore.Platforms,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms --- NuGet.config | 8 ++------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index d1e97187693..40c3b21c5c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,7 @@ - - - + @@ -21,9 +19,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bd27db2dc4..53b4bd2c9ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7c8195afbf8f45bca27b107df1650daf9023cd7a + b1b9ae8774dbff146d4a0149a85229360e1d5dfd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7c8195afbf8f45bca27b107df1650daf9023cd7a + b1b9ae8774dbff146d4a0149a85229360e1d5dfd https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 diff --git a/eng/Versions.props b/eng/Versions.props index 73621d92618..e083aa4afc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.19-servicing.23313.12 + 6.0.19-servicing.23314.6 5.0.0-alpha1.19562.1 - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 + 6.0.19-servicing.23313.25 + 6.0.19-servicing.23313.25 - 6.0.18-servicing.23269.7 - 6.0.18 - 6.0.18 - 6.0.10 + 6.0.19-servicing.23313.25 + 6.0.19 + 6.0.19 + 6.0.11 6.0.0 6.0.1 6.0.0 From f87a7b0fff7d7b0810bc2304416b267ff4b96da8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 21:29:47 +0000 Subject: [PATCH 142/188] Update dependencies from https://github.com/dotnet/arcade build 20230613.5 (#7937) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 20 +++++++------- eng/Versions.props | 6 ++--- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 8 +++--- 6 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/NuGet.config b/NuGet.config index 06be4fb0ffd..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c487a450fe5..5e545709919 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 diff --git a/eng/Versions.props b/eng/Versions.props index d2720ed04fc..73dd086159a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23211.7 - 6.0.0-beta.23211.7 - 6.0.0-beta.23211.7 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 547d878da07..0e10e7db69c 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -141,14 +145,20 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -216,7 +226,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -227,7 +237,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 00000000000..babc2757d8d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 02978aa3f1a..2b46f477f75 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.116", + "dotnet": "6.0.118", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23211.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23313.5" }, "sdk": { - "version": "6.0.116" + "version": "6.0.118" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From eb20ebb265c3a8684d42a9e167bb0101f73108cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 22:56:40 +0000 Subject: [PATCH 143/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20230615.3 (#7938) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e545709919..06f58688139 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c76ac565499f3e7c657126d46c00b67a0d74832c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - d3e9ed0d85f9dadf48486e2dce80aae55671c9c6 + 7da09742ad02067b5ff9247ef865866671c0b202 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 73dd086159a..f74316f13f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23212.3 + 6.0.0-rtm.23315.3 From 669314bc4c99d34d2d0c4299bf68b4b7ed9580b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Jun 2023 17:50:35 +0000 Subject: [PATCH 144/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230616.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.19-servicing.23314.6 -> To Version 6.0.19-servicing.23316.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d06eabdca9..ccbceab4b3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8d814e67cf3..90a5b6af5de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.2 From b956c9dc17b1f2228351058308f6d1919c1f8ade Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Mon, 19 Jun 2023 22:59:55 -0700 Subject: [PATCH 145/188] Update branding to 6.0.20 (#7948) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f74316f13f2..76b8bc68dae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 19 + 20 $(MajorVersion).$(MinorVersion).$(PatchVersion) - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccbceab4b3f..4dea2dc4410 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 2536781675df3fe4848e96605b0ee852fe3ee91b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 2536781675df3fe4848e96605b0ee852fe3ee91b https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 diff --git a/eng/Versions.props b/eng/Versions.props index 94dd02a4657..4c41820789c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.19-servicing.23316.2 + 6.0.20-servicing.23320.10 5.0.0-alpha1.19562.1 - 6.0.19-servicing.23313.25 - 6.0.19-servicing.23313.25 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 - 6.0.19-servicing.23313.25 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 6.0.11 6.0.0 6.0.1 From 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:15:25 +0000 Subject: [PATCH 147/188] Merged PR 32118: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230621.4 - **Date Produced**: June 21, 2023 5:20:08 PM UTC - **Commit**: 7f67c1539dcfa02ef740306820b44a713bdcb525 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2536781675&targetVersion=GC7f67c1539d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dea2dc4410..81951601835 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2536781675df3fe4848e96605b0ee852fe3ee91b + 7f67c1539dcfa02ef740306820b44a713bdcb525 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2536781675df3fe4848e96605b0ee852fe3ee91b + 7f67c1539dcfa02ef740306820b44a713bdcb525 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4c41820789c..577fa935809 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.20-servicing.23320.10 + 6.0.20-servicing.23321.4 From 4afc20f2a5d74ab34b111dec088fde46f51a7769 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 5 Jul 2023 21:25:46 -0700 Subject: [PATCH 148/188] Update branding to 6.0.21 (#7994) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 76b8bc68dae..431a81b4b13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 20 + 21 $(MajorVersion).$(MinorVersion).$(PatchVersion) + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06f58688139..81951601835 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + 7f67c1539dcfa02ef740306820b44a713bdcb525 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + 7f67c1539dcfa02ef740306820b44a713bdcb525 https://github.com/dotnet/runtime @@ -45,9 +45,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + a08d9ce2caf02455c0b825bcdc32974bdf769a80 diff --git a/eng/Versions.props b/eng/Versions.props index 431a81b4b13..2f91687f1d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,20 +26,20 @@ - 6.0.18-servicing.23272.1 + 6.0.20-servicing.23321.4 5.0.0-alpha1.19562.1 - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 - 6.0.18-servicing.23269.7 - 6.0.18 - 6.0.18 - 6.0.10 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 + 6.0.11 6.0.0 6.0.1 6.0.0 From 2e0b5b90a0a7c425527e23a086f37026a367a9f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 19:26:13 +0000 Subject: [PATCH 150/188] Update dependencies from https://github.com/dotnet/arcade build 20230711.3 (#8024) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 8 ++++---- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 981b869d6f1..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81951601835..1c0983c288a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 diff --git a/eng/Versions.props b/eng/Versions.props index 2f91687f1d1..3e7b4d1c8ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 - 6.0.0-beta.23313.5 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 + 6.0.0-beta.23361.3 diff --git a/global.json b/global.json index 2b46f477f75..1aeba79f7a2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.118", + "dotnet": "6.0.120", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23313.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23361.3" }, "sdk": { - "version": "6.0.118" + "version": "6.0.120" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 9e202432506b803e67e47d936235e507d65a8533 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 20:25:07 +0000 Subject: [PATCH 151/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20230712.5 (#8026) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c0983c288a..215c8720e2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 7da09742ad02067b5ff9247ef865866671c0b202 + 997f0832590b4a84b46acc7cd0982b6a4715cb73 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3e7b4d1c8ac..229fcce911d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23315.3 + 6.0.0-rtm.23362.5 From 7b8b7d5928985265109db7f148b359c96dc4828d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 03:27:14 +0000 Subject: [PATCH 152/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230713.11 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.20-servicing.23321.4 -> To Version 6.0.21-servicing.23363.11 Dependency coherency updates Microsoft.NETCore.Platforms,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.11 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms --- NuGet.config | 2 ++ eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 12 ++++++------ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..cfda5e33162 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 215c8720e2c..3cbeb147338 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + 0545d9fd7d80e0e8eaaff87aa0011ad5bc13fcc8 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d diff --git a/eng/Versions.props b/eng/Versions.props index 229fcce911d..97ebca70d64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23363.11 5.0.0-alpha1.19562.1 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 + 6.0.21-servicing.23363.11 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23320.17 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23363.11 + 6.0.21 + 6.0.21 6.0.11 6.0.0 6.0.1 From 3ce5a28a37f5cfe61ce9f8f4e19465c95b5976cd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jul 2023 20:27:38 +0000 Subject: [PATCH 153/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230714.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.21-servicing.23363.11 -> To Version 6.0.21-servicing.23364.6 Dependency coherency updates Microsoft.NETCore.Platforms From Version 6.0.11 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cbeb147338..f90b90b5890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2b42563b7b9eadd68de9c277d68fe1f61828bbb1 + 052009561f916cf06df82d89297ae3ed66cf5d2f https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0545d9fd7d80e0e8eaaff87aa0011ad5bc13fcc8 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int diff --git a/eng/Versions.props b/eng/Versions.props index 97ebca70d64..b43e624e694 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.21-servicing.23363.11 + 6.0.21-servicing.23364.6 From 38646d524b178cbc1e096769c093d7d7c95138e4 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:56:49 -0700 Subject: [PATCH 154/188] Update branding to 6.0.22 (#8063) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 229fcce911d..9f8a2bee168 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 21 + 22 $(MajorVersion).$(MinorVersion).$(PatchVersion) - %(AdditionalOptions) /clr:netcore + %(AdditionalOptions) /clr:netcore /wd4956 true From 8bef6dd8e28950b5dfe44eff1335d4c5a7a9f4e4 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 9 Aug 2023 03:11:04 -0700 Subject: [PATCH 156/188] Merging internal commits for release/6.0 (#8073) * Merged PR 30328: WPF MSRC Fix port for CVE-2023-24895 WPF MSRC Fix port for CVE-2023-24895 * Merged PR 30386: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230412.4 - **Date Produced**: April 12, 2023 6:20:51 PM UTC - **Commit**: 80a66e5fac1dbdd9604c201212bf2a866e3705ce - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC357cdc523d&targetVersion=GC80a66e5fac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 30634: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230413.3 - **Date Produced**: April 13, 2023 7:00:15 PM UTC - **Commit**: 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC80a66e5fac&targetVersion=GC1960d9e6b9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCea0418c9be&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 30768: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230418.1 - **Date Produced**: April 18, 2023 3:25:39 PM UTC - **Commit**: 455077d161050f52799300d335ac47d53b6cfedb - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1960d9e6b9&targetVersion=GC455077d161&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCea0418c9be&targetVersion=GC6e89d2b65b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31016: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230502.5 - **Date Produced**: May 2, 2023 6:56:09 PM UTC - **Commit**: 24e38444348603b9b97149b5e3ffb73f7baddc85 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC455077d161&targetVersion=GC24e3844434&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31347: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230518.4 - **Date Produced**: May 18, 2023 5:31:07 PM UTC - **Commit**: bac4e66c4abaf7e2a20990556b315f015cd518ca - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.18][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC24e3844434&targetVersion=GCbac4e66c4a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCe1d69ebd53&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e89d2b65b&targetVersion=GCe1d69ebd53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31380: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230518.8 - **Date Produced**: May 19, 2023 4:46:19 PM UTC - **Commit**: 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][4] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbac4e66c4a&targetVersion=GC9e5f193ed6&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe1d69ebd53&targetVersion=GC01f26a7417&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31444: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230522.1 - **Date Produced**: May 22, 2023 2:50:17 PM UTC - **Commit**: 865895cec5e8dc357b65c98a4a7af58643d10997 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC9e5f193ed6&targetVersion=GC865895cec5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC01f26a7417&targetVersion=GCc76ac56549&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230613.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.5 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230613.12 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.12 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230614.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23314.6 Dependency coherency updates Microsoft.NETCore.Platforms,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230616.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.19-servicing.23314.6 -> To Version 6.0.19-servicing.23316.2 * Merged PR 32051: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230620.10 - **Date Produced**: June 21, 2023 12:11:33 AM UTC - **Commit**: 2536781675df3fe4848e96605b0ee852fe3ee91b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4e9cc74519&targetVersion=GC2536781675&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.NETCore.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) * Merged PR 32118: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230621.4 - **Date Produced**: June 21, 2023 5:20:08 PM UTC - **Commit**: 7f67c1539dcfa02ef740306820b44a713bdcb525 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2536781675&targetVersion=GC7f67c1539d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230713.11 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.20-servicing.23321.4 -> To Version 6.0.21-servicing.23363.11 Dependency coherency updates Microsoft.NETCore.Platforms,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.11 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230714.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.21-servicing.23363.11 -> To Version 6.0.21-servicing.23364.6 Dependency coherency updates Microsoft.NETCore.Platforms From Version 6.0.11 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms --------- Co-authored-by: dotnet-bot Co-authored-by: Ashish Singh Co-authored-by: DotNet Bot --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..cfda5e33162 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 215c8720e2c..f90b90b5890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 052009561f916cf06df82d89297ae3ed66cf5d2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7f67c1539dcfa02ef740306820b44a713bdcb525 + 052009561f916cf06df82d89297ae3ed66cf5d2f https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a08d9ce2caf02455c0b825bcdc32974bdf769a80 + e40b3abf1b41621d4298642a5fd300ebf7cccf6d diff --git a/eng/Versions.props b/eng/Versions.props index 9f8a2bee168..43e88095b1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.20-servicing.23321.4 + 6.0.21-servicing.23364.6 5.0.0-alpha1.19562.1 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 + 6.0.21-servicing.23363.11 + 6.0.21-servicing.23363.11 - 6.0.20-servicing.23320.17 - 6.0.20 - 6.0.20 + 6.0.21-servicing.23363.11 + 6.0.21 + 6.0.21 6.0.11 6.0.0 6.0.1 From 4bffdb1911f0e5410dff19bd61009015410799bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 15:47:44 +0000 Subject: [PATCH 157/188] Update dependencies from https://github.com/dotnet/arcade build 20230808.5 (#8082) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 8 ++++---- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index cfda5e33162..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f90b90b5890..1cade54bf21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 diff --git a/eng/Versions.props b/eng/Versions.props index 43e88095b1b..96f8261581c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23361.3 - 6.0.0-beta.23361.3 - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 + 6.0.0-beta.23408.5 diff --git a/global.json b/global.json index 1aeba79f7a2..9cb5828c280 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5" }, "sdk": { - "version": "6.0.120" + "version": "6.0.121" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 1454e694d256ea0e39c354b34b2f5347cf01ab0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 17:19:46 +0000 Subject: [PATCH 158/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20230809.4 (#8083) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cade54bf21..34a38ffdb71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 997f0832590b4a84b46acc7cd0982b6a4715cb73 + 4c92f73ee8c8e74bae51cba73186e1fc7e9c5e28 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 96f8261581c..2a4022f209e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23362.5 + 6.0.0-rtm.23409.4 From ccb899fabb951da0ce4ada295ab2783170aacef8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 10 Aug 2023 03:19:19 +0000 Subject: [PATCH 159/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34a38ffdb71..56874a77a32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2a4022f209e..8292b0f4b7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23409.7 From 466bc0dcd39ca4d366ee3de8f4a23223bad2b6d6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 15 Aug 2023 18:28:10 +0000 Subject: [PATCH 160/188] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..20f9cafb055 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56874a77a32..e05f0cf5932 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 0cd1589324d3ebe379ffeeed02c8c2ff517f3354 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 0cd1589324d3ebe379ffeeed02c8c2ff517f3354 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 diff --git a/eng/Versions.props b/eng/Versions.props index 8292b0f4b7b..0394685cc21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.22-servicing.23409.7 + 6.0.22-servicing.23415.6 5.0.0-alpha1.19562.1 - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 + 6.0.22-servicing.23414.22 + 6.0.22-servicing.23414.22 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23414.22 + 6.0.22 + 6.0.22 6.0.11 6.0.0 6.0.1 From a9d6c10723434785b060eccf8383f9d4dcaf7bed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 20:48:52 +0000 Subject: [PATCH 161/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230815.9 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23415.6 -> To Version 6.0.22-servicing.23415.9 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 20f9cafb055..b4839ad2a06 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e05f0cf5932..b3b63b5b1be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0cd1589324d3ebe379ffeeed02c8c2ff517f3354 + 8e49f7f69149415593f0da365cae4ffdecb07c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0cd1589324d3ebe379ffeeed02c8c2ff517f3354 + 8e49f7f69149415593f0da365cae4ffdecb07c22 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c diff --git a/eng/Versions.props b/eng/Versions.props index 0394685cc21..3298e891b5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.22-servicing.23415.6 + 6.0.22-servicing.23415.9 5.0.0-alpha1.19562.1 - 6.0.22-servicing.23414.22 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.3 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 6.0.22 6.0.22 6.0.11 From 89f8ef7687501cce2e76a48cd405256ea0786059 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 17:33:24 +0000 Subject: [PATCH 162/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230816.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23415.9 -> To Version 6.0.22-servicing.23416.4 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.22-servicing.23415.3 -> To Version 6.0.22-servicing.23415.11 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index b4839ad2a06..1788771ab82 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3b63b5b1be..bfa141b7f7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8e49f7f69149415593f0da365cae4ffdecb07c22 + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8e49f7f69149415593f0da365cae4ffdecb07c22 + 0db2312765488a8a77ba6cef692fa53c636a47e9 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf diff --git a/eng/Versions.props b/eng/Versions.props index 3298e891b5c..0c793d63075 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.22-servicing.23415.9 + 6.0.22-servicing.23416.4 5.0.0-alpha1.19562.1 - 6.0.22-servicing.23415.3 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 6.0.22 6.0.22 6.0.11 From cc69ad111dd695019ae0bcef962265758701eba7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 07:07:25 +0000 Subject: [PATCH 163/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230824.7 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23416.4 -> To Version 6.0.22-servicing.23424.7 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.22-servicing.23415.11 -> To Version 6.0.22-servicing.23424.25 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1788771ab82..9ffdd67e442 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfa141b7f7f..59c57fe05aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd diff --git a/eng/Versions.props b/eng/Versions.props index 0c793d63075..028b6a7e310 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.22-servicing.23416.4 + 6.0.22-servicing.23424.7 5.0.0-alpha1.19562.1 - 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 6.0.22 6.0.22 6.0.11 From 14980faeb86b59bc49b2aa78d60e63962f187a04 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 31 Aug 2023 22:06:41 -0700 Subject: [PATCH 164/188] Update branding to 6.0.23 (#8170) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2a4022f209e..59ebc2ee98b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 22 + 23 $(MajorVersion).$(MinorVersion).$(PatchVersion) + + @@ -19,6 +21,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59c57fe05aa..a0ebdebc05b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 05d81d93307e9cbc7087b298e95a4c2492cd34d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 05d81d93307e9cbc7087b298e95a4c2492cd34d8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 27926b88b31..8f067021c8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23451.9 From 11340e38ee32dd57507890e638d45f3c8ce76a8e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 7 Sep 2023 00:55:40 +0000 Subject: [PATCH 166/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230906.9 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23424.7 -> To Version 6.0.23-servicing.23456.9 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0ebdebc05b..e769d2909e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 05d81d93307e9cbc7087b298e95a4c2492cd34d8 + 3e51e2a52450eee207687f16194e39dcfa0b0ca7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 05d81d93307e9cbc7087b298e95a4c2492cd34d8 + 3e51e2a52450eee207687f16194e39dcfa0b0ca7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8f067021c8f..ccb6d19629e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.23-servicing.23451.9 + 6.0.23-servicing.23456.9 From 3d60bed210760c87e13a4d5355acbcade9426f45 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Sep 2023 17:10:07 +0000 Subject: [PATCH 167/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230912.8 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23424.7 -> To Version 6.0.23-servicing.23462.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e769d2909e1..30f8d4e74ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3e51e2a52450eee207687f16194e39dcfa0b0ca7 + 35870c18d37d30b5a5c429fed53088327766ab9f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3e51e2a52450eee207687f16194e39dcfa0b0ca7 + 35870c18d37d30b5a5c429fed53088327766ab9f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ccb6d19629e..15ba476692b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.23-servicing.23456.9 + 6.0.23-servicing.23462.8 From 53a59923975fe2b393d5ea30536e4da76c67010a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Sep 2023 19:02:53 +0000 Subject: [PATCH 168/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230912.10 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23424.7 -> To Version 6.0.23-servicing.23462.10 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30f8d4e74ff..0fd34eb57a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 35870c18d37d30b5a5c429fed53088327766ab9f + 95d608bb47b3e4e7bf439fcafe1a567d22a4ac8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 35870c18d37d30b5a5c429fed53088327766ab9f + 95d608bb47b3e4e7bf439fcafe1a567d22a4ac8c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 15ba476692b..d9e90e7ec42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.23-servicing.23462.8 + 6.0.23-servicing.23462.10 From a8f612cbbc5e661d614ea21e29d15326627a52fd Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 12 Sep 2023 23:29:43 -0700 Subject: [PATCH 169/188] Merging internal commits for release/6.0 (#8211) * Merged PR 30328: WPF MSRC Fix port for CVE-2023-24895 WPF MSRC Fix port for CVE-2023-24895 * Merged PR 30386: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230412.4 - **Date Produced**: April 12, 2023 6:20:51 PM UTC - **Commit**: 80a66e5fac1dbdd9604c201212bf2a866e3705ce - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23174.2 to 6.0.17-servicing.23212.4][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC357cdc523d&targetVersion=GC80a66e5fac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 30634: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230413.3 - **Date Produced**: April 13, 2023 7:00:15 PM UTC - **Commit**: 1960d9e6b9ce9a4427ecaeaa2b5400b1a17400c4 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23212.4 to 6.0.17-servicing.23213.3][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23173.11 to 6.0.17-servicing.23212.18][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC80a66e5fac&targetVersion=GC1960d9e6b9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCea0418c9be&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 30768: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.ILDAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230418.1 - **Date Produced**: April 18, 2023 3:25:39 PM UTC - **Commit**: 455077d161050f52799300d335ac47d53b6cfedb - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23213.3 to 6.0.17-servicing.23218.1][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1960d9e6b9&targetVersion=GC455077d161&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCea0418c9be&targetVersion=GC6e89d2b65b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31016: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230502.5 - **Date Produced**: May 2, 2023 6:56:09 PM UTC - **Commit**: 24e38444348603b9b97149b5e3ffb73f7baddc85 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] - **Microsoft.Private.Winforms**: [from 6.0.17-servicing.23218.1 to 6.0.18-servicing.23252.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC455077d161&targetVersion=GC24e3844434&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31347: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.9 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230518.4 - **Date Produced**: May 18, 2023 5:31:07 PM UTC - **Commit**: bac4e66c4abaf7e2a20990556b315f015cd518ca - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23252.5 to 6.0.18-servicing.23268.4][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.18][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.18][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.17-servicing.23217.9 to 6.0.18-servicing.23266.17][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC24e3844434&targetVersion=GCbac4e66c4a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1e620a42e7&targetVersion=GCe1d69ebd53&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6e89d2b65b&targetVersion=GCe1d69ebd53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31380: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230518.8 - **Date Produced**: May 19, 2023 4:46:19 PM UTC - **Commit**: 9e5f193ed61f002d5d870df9c8b0b5e880fa595c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.4 to 6.0.18-servicing.23268.8][3] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][4] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23266.17 to 6.0.18-servicing.23268.3][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbac4e66c4a&targetVersion=GC9e5f193ed6&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe1d69ebd53&targetVersion=GC01f26a7417&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Merged PR 31444: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230522.1 - **Date Produced**: May 22, 2023 2:50:17 PM UTC - **Commit**: 865895cec5e8dc357b65c98a4a7af58643d10997 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1] - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC9e5f193ed6&targetVersion=GC865895cec5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC01f26a7417&targetVersion=GCc76ac56549&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230613.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.5 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230613.12 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23313.12 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230614.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.18-servicing.23272.1 -> To Version 6.0.19-servicing.23314.6 Dependency coherency updates Microsoft.NETCore.Platforms,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230616.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.19-servicing.23314.6 -> To Version 6.0.19-servicing.23316.2 * Merged PR 32051: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230620.10 - **Date Produced**: June 21, 2023 12:11:33 AM UTC - **Commit**: 2536781675df3fe4848e96605b0ee852fe3ee91b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4e9cc74519&targetVersion=GC2536781675&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.NETCore.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) * Merged PR 32118: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230621.4 - **Date Produced**: June 21, 2023 5:20:08 PM UTC - **Commit**: 7f67c1539dcfa02ef740306820b44a713bdcb525 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2536781675&targetVersion=GC7f67c1539d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230713.11 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.20-servicing.23321.4 -> To Version 6.0.21-servicing.23363.11 Dependency coherency updates Microsoft.NETCore.Platforms,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.11 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230714.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.21-servicing.23363.11 -> To Version 6.0.21-servicing.23364.6 Dependency coherency updates Microsoft.NETCore.Platforms From Version 6.0.11 -> To Version 6.0.11 (parent: Microsoft.Private.Winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms * [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms - Coherency Updates: - Microsoft.NETCore.ILDAsm: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.Private.Winforms) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230815.9 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23415.6 -> To Version 6.0.22-servicing.23415.9 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (parent: Microsoft.Private.Winforms * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230816.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23415.9 -> To Version 6.0.22-servicing.23416.4 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.22-servicing.23415.3 -> To Version 6.0.22-servicing.23415.11 (parent: Microsoft.Private.Winforms * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230824.7 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23416.4 -> To Version 6.0.22-servicing.23424.7 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.22-servicing.23415.11 -> To Version 6.0.22-servicing.23424.25 (parent: Microsoft.Private.Winforms --------- Co-authored-by: dotnet-bot Co-authored-by: Ashish Singh Co-authored-by: DotNet Bot --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..9ffdd67e442 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34a38ffdb71..59c57fe05aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 53190af510e57c1c146bd8a23725509771a42ae0 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd diff --git a/eng/Versions.props b/eng/Versions.props index 59ebc2ee98b..27926b88b31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23424.7 5.0.0-alpha1.19562.1 - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23424.25 + 6.0.22 + 6.0.22 6.0.11 6.0.0 6.0.1 From 5c8af0a957d50b8522d24c7eb183b29698fe8381 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Sep 2023 18:28:38 +0000 Subject: [PATCH 170/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230913.7 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23424.7 -> To Version 6.0.23-servicing.23463.7 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.22-servicing.23424.25 -> To Version 6.0.23-servicing.23431.21 (parent: Microsoft.Private.Winforms --- NuGet.config | 8 ++------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71f52b0aad3..287b7463e59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,7 @@ - - - + @@ -21,9 +19,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fd34eb57a4..68afb455fd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 95d608bb47b3e4e7bf439fcafe1a567d22a4ac8c + 304fefcac0a8bbe58a33716451651f8cf52c7aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 95d608bb47b3e4e7bf439fcafe1a567d22a4ac8c + 304fefcac0a8bbe58a33716451651f8cf52c7aec https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + 211b7ecbebe2576cbbbc205a3658361441018b61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + 211b7ecbebe2576cbbbc205a3658361441018b61 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + 211b7ecbebe2576cbbbc205a3658361441018b61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + 211b7ecbebe2576cbbbc205a3658361441018b61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + 211b7ecbebe2576cbbbc205a3658361441018b61 diff --git a/eng/Versions.props b/eng/Versions.props index d9e90e7ec42..e2f435aa2b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.23-servicing.23462.10 + 6.0.23-servicing.23463.7 5.0.0-alpha1.19562.1 - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 + 6.0.23-servicing.23431.21 + 6.0.23-servicing.23431.21 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23431.21 + 6.0.23 + 6.0.23 6.0.11 6.0.0 6.0.1 From 861269b94d96a166eedab78e87678b0cd53790fb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 01:58:36 +0000 Subject: [PATCH 171/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20230913.14 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.22-servicing.23424.7 -> To Version 6.0.23-servicing.23463.14 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.22-servicing.23424.25 -> To Version 6.0.23-servicing.23463.4 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 287b7463e59..5e02012cc8f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68afb455fd7..108cb7432ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 304fefcac0a8bbe58a33716451651f8cf52c7aec + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 304fefcac0a8bbe58a33716451651f8cf52c7aec + 4c9c993698c298801739cd2dc25efa7ffe700bde https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 211b7ecbebe2576cbbbc205a3658361441018b61 + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 211b7ecbebe2576cbbbc205a3658361441018b61 + ca8b53290abed6b00ae7a9cc331fbc69bc06026c https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 211b7ecbebe2576cbbbc205a3658361441018b61 + ca8b53290abed6b00ae7a9cc331fbc69bc06026c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 211b7ecbebe2576cbbbc205a3658361441018b61 + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 211b7ecbebe2576cbbbc205a3658361441018b61 + ca8b53290abed6b00ae7a9cc331fbc69bc06026c diff --git a/eng/Versions.props b/eng/Versions.props index e2f435aa2b8..afe258bccdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.23-servicing.23463.7 + 6.0.23-servicing.23463.14 5.0.0-alpha1.19562.1 - 6.0.23-servicing.23431.21 - 6.0.23-servicing.23431.21 + 6.0.23-servicing.23463.4 + 6.0.23-servicing.23463.4 - 6.0.23-servicing.23431.21 + 6.0.23-servicing.23463.4 6.0.23 6.0.23 6.0.11 From dd02437a1c50cd6262fdd2ecfab3aa51f5b0922d Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 3 Oct 2023 22:22:05 -0700 Subject: [PATCH 172/188] Update branding to 6.0.24 (#8265) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 27926b88b31..26792c32c0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 23 + 24 $(MajorVersion).$(MinorVersion).$(PatchVersion) - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59c57fe05aa..121a7cd9988 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + a8ba4b39b59ca421254550010de48b33d7c7b57d https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 diff --git a/eng/Versions.props b/eng/Versions.props index 26792c32c0d..b3d986f0514 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23480.3 5.0.0-alpha1.19562.1 - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23480.2 + 6.0.23 + 6.0.23 6.0.11 6.0.0 6.0.1 From de6de0e0d3fdbf497015b82bec15ed721afd44f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 16:13:17 +0000 Subject: [PATCH 174/188] Update dependencies from https://github.com/dotnet/arcade build 20231011.8 (#8298) [release/6.0] Update dependencies from dotnet/arcade --- NuGet.config | 6 +++ eng/Version.Details.xml | 20 ++++----- eng/Versions.props | 6 +-- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 8 ++-- 6 files changed, 96 insertions(+), 17 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/NuGet.config b/NuGet.config index d6b9869a728..11ebc4ef61d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + @@ -19,6 +22,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 121a7cd9988..9c9738b9f15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 diff --git a/eng/Versions.props b/eng/Versions.props index b3d986f0514..a377451b2dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23408.5 - 6.0.0-beta.23408.5 - 6.0.0-beta.23408.5 + 6.0.0-beta.23511.8 + 6.0.0-beta.23511.8 + 6.0.0-beta.23511.8 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 00000000000..e7ba975adeb --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 00000000000..83d97a26a01 --- /dev/null +++ b/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/global.json b/global.json index 9cb5828c280..45152322488 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23511.8" }, "sdk": { - "version": "6.0.121" + "version": "6.0.123" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 8a13d6745c35c137c5726a0a113dd094230a2b3f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:15:31 +0000 Subject: [PATCH 175/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20231013.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.23-servicing.23480.3 -> To Version 6.0.24-servicing.23513.4 --- NuGet.config | 8 -------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 11ebc4ef61d..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,10 +5,6 @@ - - - - @@ -22,10 +18,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c9738b9f15..a5a0bc4bd61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a377451b2dd..f26c0836b48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 6.0.23-servicing.23480.3 + 6.0.24-servicing.23513.4 From f1a13f5f42088b6b9f5293f870194b6dbe179159 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 19:31:12 +0000 Subject: [PATCH 176/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20231016.3 (#8311) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- NuGet.config | 8 -------- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 11ebc4ef61d..59cc6e76c2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,10 +5,6 @@ - - - - @@ -22,10 +18,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c9738b9f15..19045d8e0b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 4c92f73ee8c8e74bae51cba73186e1fc7e9c5e28 + b28a2aad515e30baaa1bf8c4e98414086de24b76 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a377451b2dd..77c007d4b96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23409.4 + 6.0.0-rtm.23516.3 From d032d8cf069b9c31ceefce90c3a5bb46b557900e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:33:32 +0000 Subject: [PATCH 177/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20231016.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.24-servicing.23513.4 -> To Version 6.0.24-servicing.23516.5 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.23-servicing.23480.2 -> To Version 6.0.24-servicing.23516.12 (parent: Microsoft.Private.Winforms --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59cc6e76c2e..578130b83cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95eb25e96fc..cd85f65d02b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c1396d66ff3d595b912cd5f96d6f4651427ecfcd + f74130bc3ca3b606a18011ad64ac37a7ee77d514 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c1396d66ff3d595b912cd5f96d6f4651427ecfcd + f74130bc3ca3b606a18011ad64ac37a7ee77d514 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 diff --git a/eng/Versions.props b/eng/Versions.props index 466b6e81f90..66a8b60471b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23516.5 5.0.0-alpha1.19562.1 - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 + 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.12 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23516.12 + 6.0.24 + 6.0.24 6.0.11 6.0.0 6.0.1 From 64771e6fa021ba12ed6798de8db10c50a78186af Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 21:48:46 +0000 Subject: [PATCH 178/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20231017.8 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.24-servicing.23516.5 -> To Version 6.0.24-servicing.23517.8 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.24-servicing.23516.12 -> To Version 6.0.24-servicing.23516.31 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 578130b83cd..5f1dbbacb41 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd85f65d02b..140a8e0c3f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 36b5a159142e33ab521c9539cd0bc92667f4b936 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 36b5a159142e33ab521c9539cd0bc92667f4b936 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd diff --git a/eng/Versions.props b/eng/Versions.props index 66a8b60471b..5d11ac30fec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.24-servicing.23516.5 + 6.0.24-servicing.23517.8 5.0.0-alpha1.19562.1 - 6.0.24-servicing.23516.12 - 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.31 + 6.0.24-servicing.23516.31 - 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.31 6.0.24 6.0.24 6.0.11 From 828ac641a59906148ec45386b5d73f2b50b6e532 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:28:04 -0700 Subject: [PATCH 179/188] Update branding to 6.0.25 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 77c007d4b96..a5c998ccf84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 24 + 25 $(MajorVersion).$(MinorVersion).$(PatchVersion) - 6.0.24-servicing.23517.8 + 6.0.25-servicing.23518.2 From 92dfb9221983bf25fd0c4bd3c9d1e92eaa209b9f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:32:19 +0000 Subject: [PATCH 181/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20231018.8 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.25-servicing.23518.2 -> To Version 6.0.25-servicing.23518.8 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.24-servicing.23516.31 -> To Version 6.0.24-servicing.23517.17 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f1dbbacb41..3832f847030 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b965b415e20..e107c98804d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab + faa1de187dc54c26506c49fe3f1de8217f13ee6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab + faa1de187dc54c26506c49fe3f1de8217f13ee6e https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 diff --git a/eng/Versions.props b/eng/Versions.props index 01f6e6925ee..c9905ef2a77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.25-servicing.23518.2 + 6.0.25-servicing.23518.8 5.0.0-alpha1.19562.1 - 6.0.24-servicing.23516.31 - 6.0.24-servicing.23516.31 + 6.0.24-servicing.23517.17 + 6.0.24-servicing.23517.17 - 6.0.24-servicing.23516.31 + 6.0.24-servicing.23517.17 6.0.24 6.0.24 6.0.11 From b3410c5c401cd55744e04c83c048f8873dff9e4e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 19:31:30 +0000 Subject: [PATCH 182/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20231019.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.25-servicing.23518.8 -> To Version 6.0.25-servicing.23519.6 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.24-servicing.23517.17 -> To Version 6.0.25-servicing.23518.22 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3832f847030..fa1ce17e0f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e107c98804d..93bcdea6781 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - faa1de187dc54c26506c49fe3f1de8217f13ee6e + ecafa4f6cfe989165d23fea948fc938e479fd093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - faa1de187dc54c26506c49fe3f1de8217f13ee6e + ecafa4f6cfe989165d23fea948fc938e479fd093 https://github.com/dotnet/runtime @@ -57,29 +57,29 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c diff --git a/eng/Versions.props b/eng/Versions.props index 6571f5134d1..8c6127b1b0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,19 +26,19 @@ - 6.0.25-servicing.23518.8 + 6.0.25-servicing.23519.6 5.0.0-alpha1.19562.1 - 6.0.24-servicing.23517.17 - 6.0.24-servicing.23517.17 + 6.0.25-servicing.23518.22 + 6.0.25-servicing.23518.22 - 6.0.24-servicing.23517.17 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.22 + 6.0.25 + 6.0.25 6.0.11 6.0.0 6.0.1 From a3ba56eeb03fd8cd14f2dd0d26eaa9b9496608fa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:41:36 +0000 Subject: [PATCH 183/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20231019.16 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.25-servicing.23519.6 -> To Version 6.0.25-servicing.23519.16 Dependency coherency updates Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.Private.Winforms --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index fa1ce17e0f3..de73a1efe89 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93bcdea6781..232e817ac45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ecafa4f6cfe989165d23fea948fc938e479fd093 + d4ee94199afb6c67ed448c252a07c0747c089e41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ecafa4f6cfe989165d23fea948fc938e479fd093 + d4ee94199afb6c67ed448c252a07c0747c089e41 https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 diff --git a/eng/Versions.props b/eng/Versions.props index 8c6127b1b0c..712c245afd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.25-servicing.23519.6 + 6.0.25-servicing.23519.16 5.0.0-alpha1.19562.1 - 6.0.25-servicing.23518.22 - 6.0.25-servicing.23518.22 + 6.0.25-servicing.23519.12 + 6.0.25-servicing.23519.12 - 6.0.25-servicing.23518.22 + 6.0.25-servicing.23519.12 6.0.25 6.0.25 6.0.11 From 6ba07f7d34128173754a8c99f009ef3ebd118ac5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:57:23 -0800 Subject: [PATCH 184/188] Update branding to 6.0.26 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a5c998ccf84..5698a24d66d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6 0 - 25 + 26 $(MajorVersion).$(MinorVersion).$(PatchVersion) - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 232e817ac45..6f5ea96d843 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - b28a2aad515e30baaa1bf8c4e98414086de24b76 + 18b30f0f954ebc33ded2f72d28cd270d347775b5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5baa58ef4f5..e35ec5db1a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23516.3 + 6.0.0-rtm.23571.2 From 7bab7b60c4fcde4b53cb8e2d945e214e09d8dbe8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 06:45:30 +0000 Subject: [PATCH 186/188] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 (#8442) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f5ea96d843..31523f33a6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,25 +83,25 @@ - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c diff --git a/eng/Versions.props b/eng/Versions.props index e35ec5db1a3..971a29b6d82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,9 +56,9 @@ - 6.0.0-beta.23511.8 - 6.0.0-beta.23511.8 - 6.0.0-beta.23511.8 + 6.0.0-beta.23517.3 + 6.0.0-beta.23517.3 + 6.0.0-beta.23517.3 diff --git a/global.json b/global.json index 45152322488..662042d3afd 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23511.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23517.3" }, "sdk": { "version": "6.0.123" From 4b7d4fc8f4f49e8a5c253d13ffbb8b28cb3ed373 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:00:06 +0000 Subject: [PATCH 187/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20231122.1 (#8456) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31523f33a6f..d24e7d18808 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,9 +49,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 18b30f0f954ebc33ded2f72d28cd270d347775b5 + 4e9fd815d72fa267bfa5fb21e1304501df1d2f50 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 971a29b6d82..9bcfd776478 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23571.2 + 6.0.0-rtm.23572.1 From f2288848ba2510b92757ba88e19b3ff70a4e91f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 04:59:09 +0000 Subject: [PATCH 188/188] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20231122.3 (#8459) [release/6.0] Update dependencies from dnceng/internal/dotnet-wpf-int --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d24e7d18808..333b07c3f7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 4e9fd815d72fa267bfa5fb21e1304501df1d2f50 diff --git a/eng/Versions.props b/eng/Versions.props index 9bcfd776478..ab91a1940ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,6 +97,6 @@ System.Reflection.MetadataLoadContext - 6.0.0-rtm.23572.1 + 6.0.0-rtm.23572.3