• V
    Merging internal commits for release/6.0 (#7434) · 0c8bd9f0
    vseanreesermsft 提交于
    * 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: Ndotnet-bot <dotnet-bot@microsoft.com>
    Co-authored-by: NLevi Broderick <levib@microsoft.com>
    Co-authored-by: NDotNet Bot <dn-bot@microsoft.com>
    0c8bd9f0
Versions.props 6.4 KB