Skip to content

Commit cd10d7f

Browse files
singhashish-wpfsinghashish-wpf
authored
Merge pull request #9912 from vseanreesermsft/internal-merge-6.0-2024-10-08-1030
Merging internal commits for release/6.0
2 parents 1dc7315 + 2f6a40f commit cd10d7f

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +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-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-runtime -->
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1111
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,7 +19,7 @@
1919
<disabledPackageSources>
2020
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2121
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
22+
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
2323
<!-- End: Package sources from dotnet-runtime -->
2424
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2525
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 17 additions & 17 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.33-servicing.24366.4">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.35-servicing.24462.9">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>6a984c48f3489b60f25deb72ede6e5051bb130d4</Sha>
6+
<Sha>9b5f402943986a66dfca2b6f4312cfca19d75c17</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.33-servicing.24366.4">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.35-servicing.24462.9">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>6a984c48f3489b60f25deb72ede6e5051bb130d4</Sha>
10+
<Sha>9b5f402943986a66dfca2b6f4312cfca19d75c17</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -53,33 +53,33 @@
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
5454
<Sha>bb66af4286a3180f30152f1d8de98ae889f38ade</Sha>
5555
</Dependency>
56-
<Dependency Name="System.IO.Packaging" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
57-
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
56+
<Dependency Name="System.IO.Packaging" Version="6.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
57+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.33-servicing.24366.10" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.35-servicing.24459.18" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
62+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.33-servicing.24366.10" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.35-servicing.24459.18" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
66+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</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.33" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.35" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
74+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.33" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.35" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
78+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.33-servicing.24366.10" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.35-servicing.24459.18" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>6c636980f730a30c3f5352cff80ce035ae53f016</Sha>
82+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@
2121
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
2222
<PreReleaseVersionIteration>
2323
</PreReleaseVersionIteration>
24-
<SystemIOPackagingVersion>6.0.0</SystemIOPackagingVersion>
24+
<SystemIOPackagingVersion>6.0.1</SystemIOPackagingVersion>
2525
<SystemResourcesExtensionsVersion>6.0.0</SystemResourcesExtensionsVersion>
2626
</PropertyGroup>
2727
<!-- NuGet Package Versions -->
2828
<PropertyGroup>
29-
<MicrosoftPrivateWinformsVersion>6.0.33-servicing.24366.4</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.35-servicing.24462.9</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.33-servicing.24366.10</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.33-servicing.24366.10</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.35-servicing.24459.18</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.35-servicing.24459.18</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.33-servicing.24366.10</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40-
<MicrosoftNETCoreAppRefVersion>6.0.33</MicrosoftNETCoreAppRefVersion>
41-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.33</MicrosoftNETCoreAppRuntimewinx64Version>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.35-servicing.24459.18</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40+
<MicrosoftNETCoreAppRefVersion>6.0.35</MicrosoftNETCoreAppRefVersion>
41+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.35</MicrosoftNETCoreAppRuntimewinx64Version>
4242
<MicrosoftNETCorePlatformsVersion>6.0.13</MicrosoftNETCorePlatformsVersion>
4343
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
4444
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>

0 commit comments

Comments
 (0)