Commit 2f7fc2e
Merging internal commits for release/8.0 (#9370)
* [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-winforms
* Fixes PenIMC UAF MSRC .NET 8
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240311.12
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.4-servicing.24157.9 -> To Version 8.0.4-servicing.24161.12
* Local dependencies updated based on build with BAR id 217426 (20240314.3 from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms@refs/heads/internal/release/8.0)
* Merged PR 38220: [internal/release/8.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 8.0.4-servicing.24163.26 to 8.0.4-servicing.24168.10 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 8.0.4 to 8.0.4 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.4 to 8.0.4 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.4-servicing.24163.26 to 8.0.4-servicing.24168.10 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: 0ce99e90-7dcb-4849-5aa3-08dbd5a5c716
- **Build**:
- **Date Produced**: March 19, 2024 12:25:21 AM UTC
- **Commit**: fbf1a1e892c2c37066093d856d8c23f7adff536f
- **Branch**: refs/heads/internal/release/8.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.4-servicing.24164.3 to 8.0.4-servicing.24168.13][1]
- **Microsoft.Private.Winforms**: [from 8.0.4-servicing.24164.3 to 8.0.4-servicing.24168.13][1]
- **System.Drawing.Common**: [from 8.0.4 to 8.0.4][1]
- **Microsoft.NETCore.Platforms**: [from 8.0.4-servicing.24163.26 to 8.0.4-servicing.24168.10][2]
- **Microsoft.NETCore.App.Ref**: [from 8.0.4 to 8.0.4][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.4 to 8.0.4][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.4-servicing.24163.26 to 8.0.4-servicing.24168.10][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCf37bd9d71f3baa2b2f47389aa2d2fa17324d714b&targetVersion=GCfbf1a1e892c2c37066093d856d8c23f7adff536f&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC38f2042434044be9a09065b23b7ef342a313a498&targetVersion=GCa1a9440b48374c6d400287abbb56a4ac54d9b02f&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.4-servicing.24168.13 -> To Version 8.0.4-servicing.24169.7
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.4-servicing.24169.7 -> To Version 8.0.4-servicing.24169.11
Dependency coherency updates
Microsoft.NETCore.Platforms,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0
From Version 8.0.4-servicing.24168.10 -> To Version 8.0.4-servicing.24169.9 (parent: Microsoft.Private.Winforms
* Merged PR 38977: [internal/release/8.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 8.0.4-servicing.24169.9 to 8.0.5-servicing.24215.24 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 8.0.4 to 8.0.5 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.4 to 8.0.5 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.4-servicing.24169.9 to 8.0.5-servicing.24215.24 (parent: Microsoft.Private.Winforms)
- **System.Security.Cryptography.Xml**: from 8.0.0 to 8.0.1 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: 0ce99e90-7dcb-4849-5aa3-08dbd5a5c716
- **Build**: 20240416.11
- **Date Produced**: April 16, 2024 7:38:06 PM UTC
- **Commit**: d27f6ffa6ece96c4242bbac3fcd6e30bac2b5a09
- **Branch**: refs/heads/internal/release/8.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.4-servicing.24169.11 to 8.0.5-servicing.24216.11][1]
- **Microsoft.Private.Winforms**: [from 8.0.4-servicing.24169.11 to 8.0.5-servicing.24216.11][1]
- **System.Drawing.Common**: [from 8.0.4 to 8.0.5][1]
- **Microsoft.NETCore.Platforms**: [from 8.0.4-servicing.24169.9 to 8.0.5-servicing.24215.24][2]
- **Microsoft.NETCore.App.Ref**: [from 8.0.4 to 8.0.5][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.4 to 8.0.5][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.4-servicing.24169.9 to 8.0.5-servicing.24215.24][2]
- **System.Security.Cryptography.Xml**: [from 8.0.0 to 8.0.1][3]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC41a4bd690229661e3ec74276ce3f93863b22435b&targetVersion=GCd27f6ffa6ece96c4242bbac3fcd6e30bac2b5a09&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2d7eea252964e69be94cb9c847b371b23e4dd470&targetVersion=GCdfd075b97471bd97ea70066a299d1fe92af90352&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5535e31a712343a63f5d7d796cd874e563e5ac14&targetVersion=GCdfd075b97471bd97ea70066a299d1fe92af90352&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
* Merged PR 39044: [internal/release/8.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 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 8.0.5 to 8.0.5 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.5 to 8.0.5 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15 (parent: Microsoft.Private.Winforms)
- **System.Security.Cryptography.Xml**: from 8.0.1 to 8.0.1 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: 0ce99e90-7dcb-4849-5aa3-08dbd5a5c716
- **Build**: 20240417.4
- **Date Produced**: April 17, 2024 6:54:59 PM UTC
- **Commit**: 6c37c986b6c8fc0669b38a03a03445a75b8227a6
- **Branch**: refs/heads/internal/release/8.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.5-servicing.24216.11 to 8.0.5-servicing.24217.4][1]
- **Microsoft.Private.Winforms**: [from 8.0.5-servicing.24216.11 to 8.0.5-servicing.24217.4][1]
- **System.Drawing.Common**: [from 8.0.5 to 8.0.5][1]
- **Microsoft.NETCore.Platforms**: [from 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15][2]
- **Microsoft.NETCore.App.Ref**: [from 8.0.5 to 8.0.5][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.5 to 8.0.5][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.5-servicing.24215.24 to 8.0.5-servicing.24216.15][2]
- **System.Security.Cryptography.Xml**: [from 8.0.1 to 8.0.1][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCd27f6ffa6ece96c4242bbac3fcd6e30bac2b5a09&targetVersion=GC6c37c986b6c8fc0669b38a03a03445a75b8227a6&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdfd075b97471bd97ea70066a299d1fe92af90352&targetVersion=GC087e15321bb712ef6fe8b0ba6f8bd12facf92629&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240516.2
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.5-servicing.24217.4 -> To Version 8.0.6-servicing.24266.2
Dependency coherency updates
Microsoft.NETCore.Platforms,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,System.Security.Cryptography.Xml
From Version 8.0.5-servicing.24216.15 -> To Version 8.0.6-servicing.24253.6 (parent: Microsoft.Private.Winforms
* Merged PR 39729: [internal/release/8.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 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 8.0.6 to 8.0.7 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.6 to 8.0.7 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24 (parent: Microsoft.Private.Winforms)
- **System.Security.Cryptography.Xml**: from 8.0.1 to 8.0.1 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: 0ce99e90-7dcb-4849-5aa3-08dbd5a5c716
- **Build**: 20240517.11
- **Date Produced**: May 18, 2024 5:16:39 AM UTC
- **Commit**: 0fb8cdb031a9a70521cc5e7fdb25e0cd7cd03786
- **Branch**: refs/heads/internal/release/8.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.6-servicing.24266.2 to 8.0.6-servicing.24267.11][1]
- **Microsoft.Private.Winforms**: [from 8.0.6-servicing.24266.2 to 8.0.6-servicing.24267.11][1]
- **System.Drawing.Common**: [from 8.0.6 to 8.0.6][1]
- **Microsoft.NETCore.Platforms**: [from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24][2]
- **Microsoft.NETCore.App.Ref**: [from 8.0.6 to 8.0.7][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.6 to 8.0.7][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24][2]
- **System.Security.Cryptography.Xml**: [from 8.0.1 to 8.0.1][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4e8a67279888e260abf0cf5b027cc16ea7069799&targetVersion=GC0fb8cdb031a9a70521cc5e7fdb25e0cd7cd03786&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfa5b0d8f4a8b424732cc992158aa92842f8a2846&targetVersion=GCcb4ec67fd1784497c953f65bfc390eb8bfdf6c6b&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240519.11
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.6-servicing.24267.11 -> To Version 8.0.6-servicing.24269.11
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240519.16
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.6-servicing.24267.11 -> To Version 8.0.7-servicing.24269.16
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240520.8
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.7-servicing.24269.16 -> To Version 8.0.7-servicing.24270.8
Dependency coherency updates
Microsoft.NETCore.Platforms,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,System.Security.Cryptography.Xml
From Version 8.0.7-servicing.24267.24 -> To Version 8.0.7-servicing.24270.14 (parent: Microsoft.Private.Winforms
* Merged PR 40284: [internal/release/8.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 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 8.0.7 to 8.0.7 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13 (parent: Microsoft.Private.Winforms)
- **System.Security.Cryptography.Xml**: from 8.0.1 to 8.0.1 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: 0ce99e90-7dcb-4849-5aa3-08dbd5a5c716
- **Build**: 20240611.4
- **Date Produced**: June 12, 2024 3:20:10 AM UTC
- **Commit**: 706e61ff5705f6b87ecdde0d7338006eba3467c5
- **Branch**: refs/heads/internal/release/8.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.7-servicing.24270.8 to 8.0.7-servicing.24311.4][1]
- **Microsoft.Private.Winforms**: [from 8.0.7-servicing.24270.8 to 8.0.7-servicing.24311.4][1]
- **System.Drawing.Common**: [from 8.0.7 to 8.0.7][1]
- **Microsoft.NETCore.Platforms**: [from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13][2]
- **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13][2]
- **System.Security.Cryptography.Xml**: [from 8.0.1 to 8.0.1][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb41338c372f491d19532b30fd3c6b609f963aa92&targetVersion=GC706e61ff5705f6b87ecdde0d7338006eba3467c5&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC63d80966a9f0d15e057d0d146702405b19c82533&targetVersion=GCe0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240613.2
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.7-servicing.24311.4 -> To Version 8.0.7-servicing.24313.2
Dependency coherency updates
Microsoft.NETCore.Platforms,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,System.Security.Cryptography.Xml
From Version 8.0.7-servicing.24311.13 -> To Version 8.0.7-servicing.24312.14 (parent: Microsoft.Private.Winforms
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240613.8
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common
From Version 8.0.7-servicing.24313.2 -> To Version 8.0.7-servicing.24313.8
Dependency coherency updates
Microsoft.NETCore.Platforms,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,System.Security.Cryptography.Xml
From Version 8.0.7-servicing.24312.14 -> To Version 8.0.7-servicing.24313.11 (parent: Microsoft.Private.Winforms
---------
Co-authored-by: dotnet-bot <[email protected]>
Co-authored-by: DotNet Bot <[email protected]>
Co-authored-by: dipeshmsft <[email protected]>1 parent af430d2 commit 2f7fc2e
3 files changed
+25
-21
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
| 11 | + | |
10 | 12 | | |
11 | 13 | | |
12 | 14 | | |
| |||
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
| 25 | + | |
23 | 26 | | |
24 | 27 | | |
| 28 | + | |
25 | 29 | | |
26 | 30 | | |
27 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | | - | |
| 123 | + | |
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
| |||
150 | 150 | | |
151 | 151 | | |
152 | 152 | | |
153 | | - | |
| 153 | + | |
154 | 154 | | |
155 | | - | |
| 155 | + | |
156 | 156 | | |
157 | 157 | | |
158 | 158 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
0 commit comments