Skip to content

Commit 6af5c12

Browse files
vseanreesermsftdotnet-botsinghashish-wpf
authored
Merging internal commits for release/7.0 (#7921)
* Merged PR 30327: WPF MSRC Fix port for CVE-2023-24895 WPF MSRC Fix port for CVE-2023-24895 * Merged PR 30468: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a - **Build**: 20230404.3 - **Date Produced**: April 6, 2023 10:46:31 PM UTC - **Commit**: a7742f16a6b2750e39825e301560a6abbb44b6f7 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.5-servicing.23175.1 to 7.0.6-servicing.23204.3][1] - **Microsoft.Private.Winforms**: [from 7.0.5-servicing.23175.1 to 7.0.6-servicing.23204.3][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCf75d9496cb&targetVersion=GCa7742f16a6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a) * Merged PR 30632: [internal/release/7.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 7.0.2 to 7.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 7.0.5 to 7.0.6 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.5 to 7.0.6 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.5-servicing.23174.5 to 7.0.6-servicing.23212.12 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a - **Build**: 20230413.1 - **Date Produced**: April 13, 2023 6:24:15 PM UTC - **Commit**: 22c6c79dbf4a41297d8c6c79a62e5921934ade88 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23204.3 to 7.0.6-servicing.23213.1][1] - **Microsoft.Private.Winforms**: [from 7.0.6-servicing.23204.3 to 7.0.6-servicing.23213.1][1] - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.2][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.5 to 7.0.6][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.5 to 7.0.6][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23174.5 to 7.0.6-servicing.23212.12][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCa7742f16a6&targetVersion=GC22c6c79dbf&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8042d61b17&targetVersion=GCf5f7b34502&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8042d61b17&targetVersion=GCe3acf029e6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a) * Merged PR 30652: [internal/release/7.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 7.0.2 to 7.0.2 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a - **Build**: 20230413.5 - **Date Produced**: April 13, 2023 10:22:02 PM UTC - **Commit**: b3dce1f781e8f035f43da3d5eb11d4916d1be36f - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23213.1 to 7.0.6-servicing.23213.5][1] - **Microsoft.Private.Winforms**: [from 7.0.6-servicing.23213.1 to 7.0.6-servicing.23213.5][1] - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC22c6c79dbf&targetVersion=GCb3dce1f781&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCf5f7b34502&targetVersion=GC8042d61b17&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a) * Merged PR 31017: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-winforms This pull request updates the following dependencies [marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a - **Build**: 20230502.4 - **Date Produced**: May 2, 2023 7:32:04 PM UTC - **Commit**: 0fcdb8d3ba0a80a9d77518f1cc2a1f68875aed77 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23213.5 to 7.0.7-servicing.23252.4][1] - **Microsoft.Private.Winforms**: [from 7.0.6-servicing.23213.5 to 7.0.7-servicing.23252.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb3dce1f781&targetVersion=GC0fcdb8d3ba&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a) * Merged PR 31352: [internal/release/7.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.App.Ref**: from 7.0.6 to 7.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.6 to 7.0.7 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.6-servicing.23212.12 to 7.0.7-servicing.23266.4 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a - **Build**: 20230518.2 - **Date Produced**: May 18, 2023 9:14:11 PM UTC - **Commit**: fafc9aa56432f1e5728f082b222c3ef519b3dd59 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23252.4 to 7.0.7-servicing.23268.2][1] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23252.4 to 7.0.7-servicing.23268.2][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.6 to 7.0.7][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.7-servicing.23266.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC0fcdb8d3ba&targetVersion=GCfafc9aa564&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe3acf029e6&targetVersion=GC7d21bfd55c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a) * Merged PR 31387: [internal/release/7.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.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23266.4 to 7.0.7-servicing.23268.2 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a - **Build**: 20230518.9 - **Date Produced**: May 19, 2023 5:04:53 PM UTC - **Commit**: 3632207d619ad47c9933baa5806b67b67d1a4b77 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9][1] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23266.4 to 7.0.7-servicing.23268.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCfafc9aa564&targetVersion=GC3632207d61&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC7d21bfd55c&targetVersion=GC4906b56cca&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a) * Merged PR 31453: [internal/release/7.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.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a - **Build**: 20230522.2 - **Date Produced**: May 22, 2023 3:35:25 PM UTC - **Commit**: e3bf366a7361267ba472521190d62c9d22f39b14 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2][1] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC3632207d61&targetVersion=GCe3bf366a73&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4906b56cca&targetVersion=GC8e3442dd52&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a) * Merged PR 31527: [internal/release/7.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 7.0.2 to 7.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a - **Build**: 20230524.5 - **Date Produced**: May 24, 2023 9:28:48 PM UTC - **Commit**: b4a5f0c6839363dea534f21736a9d0726c14b41c - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][1] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][1] - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.3][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCe3bf366a73&targetVersion=GCb4a5f0c683&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8042d61b17&targetVersion=GC5b20af47d9&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8e3442dd52&targetVersion=GC5b20af47d9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a) --------- Co-authored-by: dotnet-bot <[email protected]> Co-authored-by: Ashish Singh <[email protected]> Co-authored-by: DotNet Bot <[email protected]>
1 parent 6d682d0 commit 6af5c12

File tree

12 files changed

+134
-56
lines changed

12 files changed

+134
-56
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-8042d61" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8042d61b/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-8042d61-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8042d61b-2/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-8042d61-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8042d61b-1/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-5b20af4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5b20af47/nuget/v3/index.json" />
119
<!-- End: Package sources from dotnet-runtime -->
1210
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1311
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,9 +21,7 @@
2321
<disabledPackageSources>
2422
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2523
<!-- Begin: Package sources from dotnet-runtime -->
26-
<add key="darc-int-dotnet-runtime-8042d61-1" value="true" />
27-
<add key="darc-int-dotnet-runtime-8042d61-2" value="true" />
28-
<add key="darc-int-dotnet-runtime-8042d61" value="true" />
24+
<add key="darc-int-dotnet-runtime-5b20af4" value="true" />
2925
<!-- End: Package sources from dotnet-runtime -->
3026
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3127
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.5-servicing.23175.1">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.7-servicing.23274.5">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>f75d9496cbb2fe61cfdb1299520c5c34a062a898</Sha>
6+
<Sha>b4a5f0c6839363dea534f21736a9d0726c14b41c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.5-servicing.23175.1">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23274.5">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>f75d9496cbb2fe61cfdb1299520c5c34a062a898</Sha>
10+
<Sha>b4a5f0c6839363dea534f21736a9d0726c14b41c</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -45,9 +45,9 @@
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4646
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
50+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="7.0.0-rtm.23211.2">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
@@ -61,17 +61,17 @@
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6262
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.5" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
66+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
6767
</Dependency>
68-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.5" CoherentParentDependency="Microsoft.Private.Winforms">
68+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
70-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
70+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
7171
</Dependency>
72-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.5-servicing.23174.5" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23274.4" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>8042d61b17540e49e53569e3728d2faa1c596583</Sha>
74+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
</PropertyGroup>
2323
<!-- Packages that come from https://github.com/dotnet/winforms -->
2424
<PropertyGroup>
25-
<MicrosoftPrivateWinformsVersion>7.0.5-servicing.23175.1</MicrosoftPrivateWinformsVersion>
25+
<MicrosoftPrivateWinformsVersion>7.0.7-servicing.23274.5</MicrosoftPrivateWinformsVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/runtime -->
2828
<PropertyGroup>
29-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.5-servicing.23174.5</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
30-
<MicrosoftNETCoreAppRefVersion>7.0.5</MicrosoftNETCoreAppRefVersion>
31-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.5</MicrosoftNETCoreAppRuntimewinx64Version>
32-
<MicrosoftNETCorePlatformsVersion>7.0.2</MicrosoftNETCorePlatformsVersion>
29+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23274.4</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
30+
<MicrosoftNETCoreAppRefVersion>7.0.7</MicrosoftNETCoreAppRefVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
32+
<MicrosoftNETCorePlatformsVersion>7.0.3</MicrosoftNETCorePlatformsVersion>
3333
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
3434
<SystemConfigurationConfigurationManagerPackageVersion>7.0.0</SystemConfigurationConfigurationManagerPackageVersion>
3535
<SystemDiagnosticsEventLogPackageVersion>7.0.0</SystemDiagnosticsEventLogPackageVersion>

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/AppModelKnownContentFactory.cs‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
using System;
1111
using System.IO;
12-
using System.Security;
12+
using System.Security;
1313
using System.Windows;
1414
using System.Windows.Markup;
1515
using System.Windows.Navigation;
@@ -33,8 +33,16 @@ internal static class AppModelKnownContentFactory
3333
// </summary>
3434
internal static object BamlConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter)
3535
{
36-
asyncObjectConverter = null;
36+
return BamlConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false);
37+
}
3738

39+
internal static object BamlConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe)
40+
{
41+
asyncObjectConverter = null;
42+
if (isUnsafe)
43+
{
44+
throw new InvalidOperationException(SR.Get(SRID.BamlIsNotSupportedOutsideOfApplicationResources));
45+
}
3846
// If this stream comes from outside the application throw
3947
//
4048
if (!BaseUriHelper.IsPackApplicationUri(baseUri))
@@ -63,6 +71,11 @@ internal static object BamlConverter(Stream stream, Uri baseUri, bool canUseTopL
6371
// Creates an object instance from a Xaml stream and it's Uri
6472
// </summary>
6573
internal static object XamlConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter)
74+
{
75+
return XamlConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false);
76+
}
77+
78+
internal static object XamlConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe)
6679
{
6780
asyncObjectConverter = null;
6881

@@ -91,18 +104,22 @@ internal static object XamlConverter(Stream stream, Uri baseUri, bool canUseTopL
91104
XamlReader xr = new XamlReader();
92105
asyncObjectConverter = xr;
93106
xr.LoadCompleted += new AsyncCompletedEventHandler(OnParserComplete);
107+
if(isUnsafe)
108+
{
109+
pc.FromRestrictiveReader = true;
110+
}
94111
// XamlReader.Load will close the stream.
95112
return xr.LoadAsync(stream, pc);
96113
}
97114
else
98115
{
99116
// XamlReader.Load will close the stream.
100-
return XamlReader.Load(stream, pc);
117+
return XamlReader.Load(stream, pc, isUnsafe);
101118
}
102119
}
103120
}
104121

105-
private static void OnParserComplete(object sender, AsyncCompletedEventArgs args)
122+
private static void OnParserComplete(object sender, AsyncCompletedEventArgs args)
106123
{
107124
// We can get this event from cancellation. We do not care about the error if there is any
108125
// that happened as a result of cancellation.
@@ -114,13 +131,21 @@ private static void OnParserComplete(object sender, AsyncCompletedEventArgs args
114131

115132
internal static object HtmlXappConverter(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter)
116133
{
117-
asyncObjectConverter = null;
134+
return HtmlXappConverterCore(stream, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false);
135+
}
118136

137+
internal static object HtmlXappConverterCore(Stream stream, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe)
138+
{
139+
asyncObjectConverter = null;
140+
if (isUnsafe)
141+
{
142+
throw new InvalidOperationException(SR.Get(SRID.BamlIsNotSupportedOutsideOfApplicationResources));
143+
}
119144
if (canUseTopLevelBrowser)
120145
{
121146
return null;
122147
}
123-
148+
124149
if (SecurityHelper.AreStringTypesEqual(baseUri.Scheme, BaseUriHelper.PackAppBaseUri.Scheme))
125150
{
126151
baseUri = BaseUriHelper.ConvertPackUriToAbsoluteExternallyVisibleUri(baseUri);

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/MimeObjectFactory.cs‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
namespace MS.Internal.AppModel
2121
{
2222
internal delegate object StreamToObjectFactoryDelegate(Stream s, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter);
23+
internal delegate object StreamToObjectFactoryDelegateCore(Stream s, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe);
2324

2425
internal static class MimeObjectFactory
2526
{
@@ -33,26 +34,37 @@ internal static class MimeObjectFactory
3334

3435
// The delegate that we are calling is responsible for closing the stream
3536
internal static object GetObjectAndCloseStream(Stream s, ContentType contentType, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter)
37+
{
38+
return GetObjectAndCloseStreamCore(s, contentType, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, false);
39+
}
40+
41+
internal static object GetObjectAndCloseStreamCore(Stream s, ContentType contentType, Uri baseUri, bool canUseTopLevelBrowser, bool sandboxExternalContent, bool allowAsync, bool isJournalNavigation, out XamlReader asyncObjectConverter, bool isUnsafe)
3642
{
3743
object objToReturn = null;
3844
asyncObjectConverter = null;
3945

4046
if (contentType != null)
4147
{
42-
StreamToObjectFactoryDelegate d;
43-
if (_objectConverters.TryGetValue(contentType, out d))
48+
StreamToObjectFactoryDelegateCore d;
49+
if (_objectConvertersCore.TryGetValue(contentType, out d))
4450
{
45-
objToReturn = d(s, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter);
51+
objToReturn = d(s, baseUri, canUseTopLevelBrowser, sandboxExternalContent, allowAsync, isJournalNavigation, out asyncObjectConverter, isUnsafe);
4652
}
4753
}
4854

4955
return objToReturn;
5056
}
51-
57+
// The delegate registered here will be responsible for closing the stream passed to it.
58+
internal static void RegisterCore(ContentType contentType, StreamToObjectFactoryDelegateCore method)
59+
{
60+
_objectConvertersCore[contentType] = method;
61+
}
62+
5263
// The delegate registered here will be responsible for closing the stream passed to it.
5364
internal static void Register(ContentType contentType, StreamToObjectFactoryDelegate method)
5465
{
55-
_objectConverters[contentType] = method;
66+
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));
67+
RegisterCore(contentType, methodCore);
5668
}
5769

5870
#endregion
@@ -66,7 +78,8 @@ internal static void Register(ContentType contentType, StreamToObjectFactoryDele
6678

6779
#region private members
6880

69-
private static readonly Dictionary<ContentType, StreamToObjectFactoryDelegate> _objectConverters = new Dictionary<ContentType, StreamToObjectFactoryDelegate>(capacity: 9, new ContentType.WeakComparer());
81+
private static readonly Dictionary<ContentType, StreamToObjectFactoryDelegate> _objectConverters = new Dictionary<ContentType, StreamToObjectFactoryDelegate>(9, new ContentType.WeakComparer());
82+
private static readonly Dictionary<ContentType, StreamToObjectFactoryDelegateCore> _objectConvertersCore = new Dictionary<ContentType, StreamToObjectFactoryDelegateCore>(9, new ContentType.WeakComparer());
7083

7184
#endregion
7285
}

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,20 +1979,22 @@ private static void ApplicationInit()
19791979
// and mark it as thread-safe so PackWebResponse won't protect returned streams with a synchronizing wrapper
19801980
PreloadedPackages.AddPackage(PackUriHelper.GetPackageUri(BaseUriHelper.PackAppBaseUri), new ResourceContainer(), true);
19811981

1982-
MimeObjectFactory.Register(MimeTypeMapper.BamlMime, new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.BamlConverter));
19831982

1984-
StreamToObjectFactoryDelegate xamlFactoryDelegate = new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.XamlConverter);
1983+
MimeObjectFactory.RegisterCore(MimeTypeMapper.BamlMime, new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.BamlConverterCore));
19851984

1986-
MimeObjectFactory.Register(MimeTypeMapper.XamlMime, xamlFactoryDelegate);
1987-
MimeObjectFactory.Register(MimeTypeMapper.FixedDocumentMime, xamlFactoryDelegate);
1988-
MimeObjectFactory.Register(MimeTypeMapper.FixedDocumentSequenceMime, xamlFactoryDelegate);
1989-
MimeObjectFactory.Register(MimeTypeMapper.FixedPageMime, xamlFactoryDelegate);
1990-
MimeObjectFactory.Register(MimeTypeMapper.ResourceDictionaryMime, xamlFactoryDelegate);
1985+
StreamToObjectFactoryDelegateCore xamlFactoryDelegate = new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.XamlConverterCore);
19911986

1992-
StreamToObjectFactoryDelegate htmlxappFactoryDelegate = new StreamToObjectFactoryDelegate(AppModelKnownContentFactory.HtmlXappConverter);
1993-
MimeObjectFactory.Register(MimeTypeMapper.HtmMime, htmlxappFactoryDelegate);
1994-
MimeObjectFactory.Register(MimeTypeMapper.HtmlMime, htmlxappFactoryDelegate);
1995-
MimeObjectFactory.Register(MimeTypeMapper.XbapMime, htmlxappFactoryDelegate);
1987+
MimeObjectFactory.RegisterCore(MimeTypeMapper.XamlMime, xamlFactoryDelegate);
1988+
MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedDocumentMime, xamlFactoryDelegate);
1989+
MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedDocumentSequenceMime, xamlFactoryDelegate);
1990+
MimeObjectFactory.RegisterCore(MimeTypeMapper.FixedPageMime, xamlFactoryDelegate);
1991+
MimeObjectFactory.RegisterCore(MimeTypeMapper.ResourceDictionaryMime, xamlFactoryDelegate);
1992+
1993+
StreamToObjectFactoryDelegateCore htmlxappFactoryDelegate = new StreamToObjectFactoryDelegateCore(AppModelKnownContentFactory.HtmlXappConverterCore);
1994+
MimeObjectFactory.RegisterCore(MimeTypeMapper.HtmMime, htmlxappFactoryDelegate);
1995+
MimeObjectFactory.RegisterCore(MimeTypeMapper.HtmlMime, htmlxappFactoryDelegate);
1996+
MimeObjectFactory.RegisterCore(MimeTypeMapper.XbapMime, htmlxappFactoryDelegate);
1997+
19961998
}
19971999

19982000
// This function returns the resource stream including resource and content file.

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/ParserContext.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ public static XmlParserContext ToXmlParserContext(ParserContext parserContext)
475475

476476
#region Internal
477477

478+
internal bool FromRestrictiveReader { get; set; }
478479

479480
// Reset stack to default state
480481
private void EndRepeat()

0 commit comments

Comments
 (0)