Skip to content

Commit b5b1013

Browse files
mmitchemmitche
authored
Merge pull request #3776 from vseanreesermsft/internal-merge-7.0-2023-08-08-1042
Merging internal commits for release/7.0
2 parents 239c762 + add62e0 commit b5b1013

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
12+
<add key="darc-int-dotnet-runtime-a6dbb80" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-runtime -->
1314
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1415
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,6 +24,7 @@
2324
<clear />
2425
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2526
<!-- Begin: Package sources from dotnet-runtime -->
27+
<add key="darc-int-dotnet-runtime-a6dbb80" value="true" />
2628
<!-- End: Package sources from dotnet-runtime -->
2729
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2830
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.9-servicing.23320.18" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
6+
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.9-servicing.23321.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>dd121ee97234c7490f6111cf0c7bfa9235923f81</Sha>
10+
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.9-servicing.23321.9">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.10-servicing.23364.4">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>d41bd7da4139331ef02657deb7944df43b8a181c</Sha>
14+
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.9-servicing.23321.9">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.10-servicing.23364.4">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>d41bd7da4139331ef02657deb7944df43b8a181c</Sha>
18+
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.9" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
22+
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.9-servicing.23320.18" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
26+
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.9" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
30+
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.9-servicing.23321.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>dd121ee97234c7490f6111cf0c7bfa9235923f81</Sha>
34+
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.9-servicing.23321.9">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.4">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>d41bd7da4139331ef02657deb7944df43b8a181c</Sha>
38+
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<NETCoreAppMaximumVersion>7.0</NETCoreAppMaximumVersion>
2020
<NETCoreAppFrameworkVersion>7.0</NETCoreAppFrameworkVersion>
2121
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
22-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.9-servicing.23321.6</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.9-servicing.23321.9</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.10-servicing.23364.5</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--Package versions-->
2626
<PropertyGroup>
@@ -30,14 +30,14 @@
3030
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksInstallersVersion>
3131
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23408.3</MicrosoftDotNetVersionToolsTasksVersion>
3232
<!-- runtime -->
33-
<MicrosoftNETCoreAppRefVersion>7.0.9</MicrosoftNETCoreAppRefVersion>
34-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.9</MicrosoftNETCoreAppRuntimewinx64Version>
35-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.9-servicing.23320.18</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.9-servicing.23320.18</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
33+
<MicrosoftNETCoreAppRefVersion>7.0.10</MicrosoftNETCoreAppRefVersion>
34+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.10</MicrosoftNETCoreAppRuntimewinx64Version>
35+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.10-servicing.23363.12</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
3737
<!-- winforms -->
38-
<MicrosoftPrivateWinformsVersion>7.0.9-servicing.23321.6</MicrosoftPrivateWinformsVersion>
38+
<MicrosoftPrivateWinformsVersion>7.0.10-servicing.23364.5</MicrosoftPrivateWinformsVersion>
3939
<!-- wpf -->
40-
<MicrosoftDotNetWpfGitHubVersion>7.0.9-servicing.23321.9</MicrosoftDotNetWpfGitHubVersion>
40+
<MicrosoftDotNetWpfGitHubVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfGitHubVersion>
4141
<!-- Not auto-updated. -->
4242
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
4343
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)