Skip to content

Commit bc1c8cd

Browse files
Merge pull request #8896 from vseanreesermsft/internal-merge-7.0-2024-03-12-1057
Merging internal commits for release/7.0
2 parents 3c91cd9 + badeff2 commit bc1c8cd

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
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-dff486f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2/nuget/v3/index.json" />
89
<add key="darc-int-dotnet-runtime-567edaf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe/nuget/v3/index.json" />
910
<add key="darc-int-dotnet-runtime-567edaf-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-2/nuget/v3/index.json" />
1011
<add key="darc-int-dotnet-runtime-567edaf-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-1/nuget/v3/index.json" />
@@ -23,6 +24,7 @@
2324
<disabledPackageSources>
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-dff486f" value="true" />
2628
<add key="darc-int-dotnet-runtime-567edaf-1" value="true" />
2729
<add key="darc-int-dotnet-runtime-567edaf-2" value="true" />
2830
<add key="darc-int-dotnet-runtime-567edaf" value="true" />

eng/Version.Details.xml

Lines changed: 10 additions & 10 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="7.0.16-servicing.24067.11">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.17-servicing.24116.2">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>3d504675f930028236a0f09e47c900ad48bd3d6e</Sha>
6+
<Sha>a21b74e7f5e96ccb8d95dcde605669feb30f6c5b</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.16-servicing.24067.11">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.17-servicing.24116.2">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>3d504675f930028236a0f09e47c900ad48bd3d6e</Sha>
10+
<Sha>a21b74e7f5e96ccb8d95dcde605669feb30f6c5b</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -61,17 +61,17 @@
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6262
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.16" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.17" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
66+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
6767
</Dependency>
68-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.16" CoherentParentDependency="Microsoft.Private.Winforms">
68+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.17" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
70-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
70+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
7171
</Dependency>
72-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.16-servicing.24066.29" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.17-servicing.24115.8" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
74+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
</PropertyGroup>
2323
<!-- Packages that come from https://github.com/dotnet/winforms -->
2424
<PropertyGroup>
25-
<MicrosoftPrivateWinformsVersion>7.0.16-servicing.24067.11</MicrosoftPrivateWinformsVersion>
25+
<MicrosoftPrivateWinformsVersion>7.0.17-servicing.24116.2</MicrosoftPrivateWinformsVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/runtime -->
2828
<PropertyGroup>
29-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.16-servicing.24066.29</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
30-
<MicrosoftNETCoreAppRefVersion>7.0.16</MicrosoftNETCoreAppRefVersion>
31-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.16</MicrosoftNETCoreAppRuntimewinx64Version>
29+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.17-servicing.24115.8</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
30+
<MicrosoftNETCoreAppRefVersion>7.0.17</MicrosoftNETCoreAppRefVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.17</MicrosoftNETCoreAppRuntimewinx64Version>
3232
<MicrosoftNETCorePlatformsVersion>7.0.4</MicrosoftNETCorePlatformsVersion>
3333
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
3434
<SystemConfigurationConfigurationManagerPackageVersion>7.0.0</SystemConfigurationConfigurationManagerPackageVersion>

0 commit comments

Comments
 (0)