Skip to content

Commit 8329348

Browse files
vseanreesermsftdotnet-botmmitchesinghashish-wpf
authored
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 <[email protected]> Co-authored-by: dotnet-bot <[email protected]> Co-authored-by: mmitche <[email protected]> Co-authored-by: Ashish Kumar Singh <[email protected]>
1 parent 90eee3c commit 8329348

File tree

4 files changed

+41
-39
lines changed

4 files changed

+41
-39
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +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-be98e88" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-be98e88c/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-runtime -->
910
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1011
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -18,6 +19,7 @@
1819
<disabledPackageSources>
1920
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2021
<!-- Begin: Package sources from dotnet-runtime -->
22+
<add key="darc-int-dotnet-runtime-be98e88" value="true" />
2123
<!-- End: Package sources from dotnet-runtime -->
2224
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2325
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 27 additions & 27 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="6.0.3-servicing.22123.7">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.4-servicing.22164.7">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>1f426c90a9589dabc16d114aa91bfea9f21f8571</Sha>
6+
<Sha>0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.3-servicing.22123.7">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.4-servicing.22164.7">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>1f426c90a9589dabc16d114aa91bfea9f21f8571</Sha>
10+
<Sha>0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -45,63 +45,63 @@
4545
<Uri>https://github.com/dotnet/runtime</Uri>
4646
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
50+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.22212.1">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
54-
<Sha>88ff411715df6da3c1e6c789496f83042b470d3a</Sha>
54+
<Sha>c8d46e6b93f648dd15d27210af19b62f98205daa</Sha>
5555
</Dependency>
5656
<Dependency Name="System.IO.Packaging" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
5858
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.3-servicing.22123.9" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
62+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.3-servicing.22123.9" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
66+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
6767
</Dependency>
6868
<Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://github.com/dotnet/runtime</Uri>
7070
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
7171
</Dependency>
72-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
74+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
78+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.3-servicing.22123.9" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
82+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22206.7">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22122.7">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
88+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22206.7">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22122.7">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
92+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22206.7">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22122.7">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
96+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22206.7">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22122.7">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
100+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22206.7">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22122.7">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>254113fd7c3ee04f832c165d6aec1a6077de0d63</Sha>
104+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</Dependencies>

‎eng/Versions.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
</PropertyGroup>
2727
<!-- NuGet Package Versions -->
2828
<PropertyGroup>
29-
<MicrosoftPrivateWinformsVersion>6.0.3-servicing.22123.7</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.4-servicing.22164.7</MicrosoftPrivateWinformsVersion>
3030
</PropertyGroup>
3131
<!-- Packages that come from https://github.com/dotnet/coreclr -->
3232
<PropertyGroup>
3333
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
34-
<MicrosoftNETCoreILDAsmVersion>6.0.3-servicing.22123.9</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.3-servicing.22123.9</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.4-servicing.22164.4</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.4-servicing.22164.4</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.3-servicing.22123.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40-
<MicrosoftNETCoreAppRefVersion>6.0.3</MicrosoftNETCoreAppRefVersion>
41-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
42-
<MicrosoftNETCorePlatformsVersion>6.0.2</MicrosoftNETCorePlatformsVersion>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.4-servicing.22164.4</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40+
<MicrosoftNETCoreAppRefVersion>6.0.4</MicrosoftNETCoreAppRefVersion>
41+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
42+
<MicrosoftNETCorePlatformsVersion>6.0.3</MicrosoftNETCorePlatformsVersion>
4343
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
4444
<SystemDirectoryServicesVersion>6.0.0</SystemDirectoryServicesVersion>
4545
<SystemReflectionMetadataLoadContextVersion>6.0.0</SystemReflectionMetadataLoadContextVersion>
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Packages that come from https://github.com/dotnet/arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22206.7</MicrosoftDotNetApiCompatVersion>
60-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.22206.7</MicrosoftDotNetCodeAnalysisPackageVersion>
61-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22206.7</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22122.7</MicrosoftDotNetApiCompatVersion>
60+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.22122.7</MicrosoftDotNetCodeAnalysisPackageVersion>
61+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22122.7</MicrosoftDotNetGenAPIVersion>
6262
</PropertyGroup>
6363
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
6464
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22206.7",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22206.7"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7"
1717
},
1818
"sdk": {
1919
"version": "6.0.103"

0 commit comments

Comments
 (0)