Skip to content

Commit 3f5bd13

Browse files
JL03-YueJL03-Yue
authored
Merging internal commits for release/7.0.4xx (#39451)
2 parents 0615cfc + be44d99 commit 3f5bd13

File tree

3 files changed

+79
-73
lines changed

3 files changed

+79
-73
lines changed

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7+
<add key="darc-int-dotnet-aspnetcore-d0ca5a8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d0ca5a8d-1/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-aspnetcore -->
89
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
910
<add key="darc-pub-DotNet-msbuild-Trusted-3ebbd7c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-3ebbd7c4/nuget/v3/index.json" />
1011
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1112
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1213
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1314
<!-- Begin: Package sources from dotnet-runtime -->
15+
<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" />
1416
<!-- End: Package sources from dotnet-runtime -->
1517
<!-- Begin: Package sources from dotnet-templating -->
1618
<add key="darc-pub-dotnet-templating-8edb52e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8edb52e0/nuget/v3/index.json" />
1719
<!-- End: Package sources from dotnet-templating -->
1820
<!-- Begin: Package sources from dotnet-windowsdesktop -->
21+
<add key="darc-int-dotnet-windowsdesktop-8e24710" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8e247102/nuget/v3/index.json" />
1922
<!-- End: Package sources from dotnet-windowsdesktop -->
2023
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2124
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -37,10 +40,13 @@
3740
<!-- Begin: Package sources from dotnet-templating -->
3841
<!-- End: Package sources from dotnet-templating -->
3942
<!-- Begin: Package sources from dotnet-aspnetcore -->
43+
<add key="darc-int-dotnet-aspnetcore-d0ca5a8-1" value="true" />
4044
<!-- End: Package sources from dotnet-aspnetcore -->
4145
<!-- Begin: Package sources from dotnet-runtime -->
46+
<add key="darc-int-dotnet-runtime-dff486f" value="true" />
4247
<!-- End: Package sources from dotnet-runtime -->
4348
<!-- Begin: Package sources from dotnet-windowsdesktop -->
49+
<add key="darc-int-dotnet-windowsdesktop-8e24710" value="true" />
4450
<!-- End: Package sources from dotnet-windowsdesktop -->
4551
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4652
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,41 @@
1010
<Sha>8edb52e0814ec2803de3490304f286845228ca42</Sha>
1111
<SourceBuild RepoName="templating" ManagedOnly="true" />
1212
</Dependency>
13-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.16">
13+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.17">
1414
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
15-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
15+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
1616
</Dependency>
17-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.16-servicing.24066.29">
17+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.17-servicing.24115.8">
1818
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
19-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
19+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
2020
</Dependency>
21-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.16-servicing.24066.29">
21+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.17-servicing.24115.8">
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
23-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
23+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.16">
25+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.17">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
27-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
27+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.16">
29+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.17">
3030
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
31-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
31+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
3232
</Dependency>
3333
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.4">
3434
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3535
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.16-servicing.24066.29">
37+
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.17-servicing.24115.8">
3838
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
39-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
39+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
4040
</Dependency>
4141
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0">
4242
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4343
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.16">
45+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.17">
4646
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
47-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
47+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.Build" Version="17.7.4">
5050
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -101,13 +101,13 @@
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102102
<Sha>9d4cc0304792762c34f41cbbec67a1fcd2dc764f</Sha>
103103
</Dependency>
104-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="7.0.16-servicing.24068.15">
104+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="7.0.17-servicing.24116.13">
105105
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
106-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
106+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
107107
</Dependency>
108-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="7.0.16">
108+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="7.0.17">
109109
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
110-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
110+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
111111
</Dependency>
112112
<Dependency Name="NuGet.Build.Tasks" Version="6.7.1-rc.1">
113113
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
@@ -122,9 +122,9 @@
122122
<Sha>53b3303c57b3fe659500fb362a0eef12991c1197</Sha>
123123
<SourceBuild RepoName="linker" ManagedOnly="true" />
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.16">
125+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.17">
126126
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
127-
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
127+
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
128128
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
129129
</Dependency>
130130
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.23401.1">
@@ -155,70 +155,70 @@
155155
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
156156
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.16">
158+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.17">
159159
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
160-
<Sha>f58ad2d644bb52baf49e85be027bf2db3fced446</Sha>
160+
<Sha>8e24710202fffe3656e6d26d6a03e53b3de83484</Sha>
161161
</Dependency>
162-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.16-servicing.24068.4">
162+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.17-servicing.24116.11">
163163
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
164-
<Sha>f58ad2d644bb52baf49e85be027bf2db3fced446</Sha>
164+
<Sha>8e24710202fffe3656e6d26d6a03e53b3de83484</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.16">
166+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.17">
167167
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
168-
<Sha>f58ad2d644bb52baf49e85be027bf2db3fced446</Sha>
168+
<Sha>8e24710202fffe3656e6d26d6a03e53b3de83484</Sha>
169169
</Dependency>
170-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.16-servicing.24068.4">
170+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.17-servicing.24116.11">
171171
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
172-
<Sha>f58ad2d644bb52baf49e85be027bf2db3fced446</Sha>
172+
<Sha>8e24710202fffe3656e6d26d6a03e53b3de83484</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.16-servicing.24068.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
174+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.17-servicing.24116.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
175175
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
176-
<Sha>4a6accdbfd70e66399781c75b0c0a179f4b7e7eb</Sha>
176+
<Sha>6b9b816bff16a1b507019fe6313b6baecb83b580</Sha>
177177
</Dependency>
178-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.16">
178+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.17">
179179
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
180-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
180+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
181181
</Dependency>
182-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.16-servicing.24068.15">
182+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.17-servicing.24116.13">
183183
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
184-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
184+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.16">
186+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.17">
187187
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
188-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
188+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
189189
</Dependency>
190-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.16-servicing.24068.15">
190+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.17-servicing.24116.13">
191191
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
192-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
192+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
193193
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
194194
</Dependency>
195-
<Dependency Name="dotnet-dev-certs" Version="7.0.16-servicing.24068.15">
195+
<Dependency Name="dotnet-dev-certs" Version="7.0.17-servicing.24116.13">
196196
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
197-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
197+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
198198
</Dependency>
199-
<Dependency Name="dotnet-user-jwts" Version="7.0.16-servicing.24068.15">
199+
<Dependency Name="dotnet-user-jwts" Version="7.0.17-servicing.24116.13">
200200
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
201-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
201+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
202202
</Dependency>
203-
<Dependency Name="dotnet-user-secrets" Version="7.0.16-servicing.24068.15">
203+
<Dependency Name="dotnet-user-secrets" Version="7.0.17-servicing.24116.13">
204204
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
205-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
205+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
206206
</Dependency>
207-
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="7.0.16-servicing.24068.15">
207+
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="7.0.17-servicing.24116.13">
208208
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
209-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
209+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
210210
</Dependency>
211-
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="7.0.16-servicing.24068.15">
211+
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="7.0.17-servicing.24116.13">
212212
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
213-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
213+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
214214
</Dependency>
215-
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="7.0.16-servicing.24068.15">
215+
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="7.0.17-servicing.24116.13">
216216
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
217-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
217+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
218218
</Dependency>
219-
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="7.0.16-servicing.24068.15">
219+
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="7.0.17-servicing.24116.13">
220220
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
221-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
221+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
222222
</Dependency>
223223
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.23330.1">
224224
<Uri>https://github.com/dotnet/razor</Uri>
@@ -237,21 +237,21 @@
237237
<Uri>https://github.com/dotnet/razor</Uri>
238238
<Sha>0ab18affdf2a37647768d0e25f5f021bee6257a1</Sha>
239239
</Dependency>
240-
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.16">
240+
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.17">
241241
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
242-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
242+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
243243
</Dependency>
244-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="7.0.16">
244+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="7.0.17">
245245
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
246-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
246+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="7.0.16">
248+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="7.0.17">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
250-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
250+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.JSInterop" Version="7.0.16">
252+
<Dependency Name="Microsoft.JSInterop" Version="7.0.17">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
254-
<Sha>610fe433e07b32ed451ed99d07df63be47c29050</Sha>
254+
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
255255
</Dependency>
256256
<Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
257257
<Uri>https://github.com/dotnet/xdt</Uri>

0 commit comments

Comments
 (0)