Skip to content

Commit c2a17b1

Browse files
wtgodbewtgodbe
authored
Merge pull request #6783 from wtgodbe/internal-merge-6.0-2022-07-12-1059
Merging internal commits for release/6.0
2 parents 45038ed + 9281791 commit c2a17b1

File tree

3 files changed

+25
-31
lines changed

3 files changed

+25
-31
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +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-7cca709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-7cca709-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d-4/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-7cca709-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d-3/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-7cca709-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d-1/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-0ec02c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c/nuget/v3/index.json" />
129
<!-- End: Package sources from dotnet-runtime -->
1310
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1411
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,10 +19,7 @@
2219
<disabledPackageSources>
2320
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2421
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-7cca709-1" value="true" />
26-
<add key="darc-int-dotnet-runtime-7cca709-3" value="true" />
27-
<add key="darc-int-dotnet-runtime-7cca709-4" value="true" />
28-
<add key="darc-int-dotnet-runtime-7cca709" value="true" />
22+
<add key="darc-int-dotnet-runtime-0ec02c8" value="true" />
2923
<!-- End: Package sources from dotnet-runtime -->
3024
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3125
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 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.6-servicing.22267.5">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.7-servicing.22322.3">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8</Sha>
6+
<Sha>24977050704b627e631caf7b1ca4bcb0543f3ab2</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.6-servicing.22267.5">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.7-servicing.22322.3">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8</Sha>
10+
<Sha>24977050704b627e631caf7b1ca4bcb0543f3ab2</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,9 +45,9 @@
4545
<Uri>https://github.com/dotnet/runtime</Uri>
4646
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.5" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
50+
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.22314.4">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
@@ -57,29 +57,29 @@
5757
<Uri>https://github.com/dotnet/runtime</Uri>
5858
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.6-servicing.22267.7" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.7-servicing.22322.2" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
62+
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.6-servicing.22267.7" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.7-servicing.22322.2" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
66+
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</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.6" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
74+
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
78+
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22267.7" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.7-servicing.22322.2" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha>
82+
<Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 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.6-servicing.22267.5</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.7-servicing.22322.3</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.6-servicing.22267.7</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.6-servicing.22267.7</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.7-servicing.22322.2</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.7-servicing.22322.2</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22267.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40-
<MicrosoftNETCoreAppRefVersion>6.0.6</MicrosoftNETCoreAppRefVersion>
41-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.6</MicrosoftNETCoreAppRuntimewinx64Version>
42-
<MicrosoftNETCorePlatformsVersion>6.0.4</MicrosoftNETCorePlatformsVersion>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.7-servicing.22322.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40+
<MicrosoftNETCoreAppRefVersion>6.0.7</MicrosoftNETCoreAppRefVersion>
41+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
42+
<MicrosoftNETCorePlatformsVersion>6.0.5</MicrosoftNETCorePlatformsVersion>
4343
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
4444
<SystemDirectoryServicesVersion>6.0.0</SystemDirectoryServicesVersion>
4545
<SystemReflectionMetadataLoadContextVersion>6.0.0</SystemReflectionMetadataLoadContextVersion>

0 commit comments

Comments
 (0)