Skip to content

Commit 73cbbfd

Browse files
marcpopMSFTmarcpopMSFT
authored
Merging internal commits for release/7.0.4xx (#40081)
2 parents 3602dcc + 4b25203 commit 73cbbfd

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-f050ae0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f050ae04/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-77d58ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-77d58ec6/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-544c7e6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-544c7e6e/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-51bb155" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-51bb155c/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-af494c5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af494c5c/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" />
@@ -39,10 +42,13 @@
3942
<!-- Begin: Package sources from dotnet-templating -->
4043
<!-- End: Package sources from dotnet-templating -->
4144
<!-- Begin: Package sources from dotnet-aspnetcore -->
45+
<add key="darc-int-dotnet-aspnetcore-f050ae0" value="true" />
4246
<!-- End: Package sources from dotnet-aspnetcore -->
4347
<!-- Begin: Package sources from dotnet-runtime -->
48+
<add key="darc-int-dotnet-runtime-544c7e6" value="true" />
4449
<!-- End: Package sources from dotnet-runtime -->
4550
<!-- Begin: Package sources from dotnet-windowsdesktop -->
51+
<add key="darc-int-dotnet-windowsdesktop-af494c5" value="true" />
4652
<!-- End: Package sources from dotnet-windowsdesktop -->
4753
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4854
</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>51bb155cb883988d3c52e20be40cfbe0f59e40df</Sha>
1111
<SourceBuild RepoName="templating" ManagedOnly="true" />
1212
</Dependency>
13-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.17">
13+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.18">
1414
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
15-
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
15+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
1616
</Dependency>
17-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.17-servicing.24115.8">
17+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.18-servicing.24169.14">
1818
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
19-
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
19+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
2020
</Dependency>
21-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.17-servicing.24115.8">
21+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.18-servicing.24169.14">
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
23-
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
23+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.17">
25+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.18">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
27-
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
27+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.17">
29+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.18">
3030
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
31-
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
31+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</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.17-servicing.24115.8">
37+
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.18-servicing.24169.14">
3838
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
39-
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
39+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</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.17">
45+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.18">
4646
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
47-
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
47+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.Build" Version="17.7.6">
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.17-servicing.24116.13">
104+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="7.0.18-servicing.24169.24">
105105
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
106-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
106+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
107107
</Dependency>
108-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="7.0.17">
108+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="7.0.18">
109109
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
110-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
110+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</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>
@@ -126,9 +126,9 @@
126126
<Sha>53b3303c57b3fe659500fb362a0eef12991c1197</Sha>
127127
<SourceBuild RepoName="linker" ManagedOnly="true" />
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.17">
129+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.18">
130130
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
131-
<Sha>dff486f2d78d3f932d0f9bfa38043f85e358fb8c</Sha>
131+
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
132132
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
133133
</Dependency>
134134
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.23401.1">
@@ -159,70 +159,70 @@
159159
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
160160
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.17">
162+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.18">
163163
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
164-
<Sha>8e24710202fffe3656e6d26d6a03e53b3de83484</Sha>
164+
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
165165
</Dependency>
166-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.17-servicing.24116.11">
166+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.18-servicing.24170.3">
167167
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
168-
<Sha>8e24710202fffe3656e6d26d6a03e53b3de83484</Sha>
168+
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.17">
170+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.18">
171171
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
172-
<Sha>8e24710202fffe3656e6d26d6a03e53b3de83484</Sha>
172+
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
173173
</Dependency>
174-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.17-servicing.24116.11">
174+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.18-servicing.24170.3">
175175
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
176-
<Sha>8e24710202fffe3656e6d26d6a03e53b3de83484</Sha>
176+
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
177177
</Dependency>
178-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.17-servicing.24116.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
178+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.18-servicing.24169.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
179179
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
180-
<Sha>6b9b816bff16a1b507019fe6313b6baecb83b580</Sha>
180+
<Sha>71273b560061b69cef763838282ef085e53a73cb</Sha>
181181
</Dependency>
182-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.17">
182+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.18">
183183
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
184-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
184+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.17-servicing.24116.13">
186+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.18-servicing.24169.24">
187187
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
188-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
188+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.17">
190+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.18">
191191
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
192-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
192+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
193193
</Dependency>
194-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.17-servicing.24116.13">
194+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.18-servicing.24169.24">
195195
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
196-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
196+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
197197
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
198198
</Dependency>
199-
<Dependency Name="dotnet-dev-certs" Version="7.0.17-servicing.24116.13">
199+
<Dependency Name="dotnet-dev-certs" Version="7.0.18-servicing.24169.24">
200200
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
201-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
201+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
202202
</Dependency>
203-
<Dependency Name="dotnet-user-jwts" Version="7.0.17-servicing.24116.13">
203+
<Dependency Name="dotnet-user-jwts" Version="7.0.18-servicing.24169.24">
204204
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
205-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
205+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
206206
</Dependency>
207-
<Dependency Name="dotnet-user-secrets" Version="7.0.17-servicing.24116.13">
207+
<Dependency Name="dotnet-user-secrets" Version="7.0.18-servicing.24169.24">
208208
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
209-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
209+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
210210
</Dependency>
211-
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="7.0.17-servicing.24116.13">
211+
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="7.0.18-servicing.24169.24">
212212
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
213-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
213+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
214214
</Dependency>
215-
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="7.0.17-servicing.24116.13">
215+
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="7.0.18-servicing.24169.24">
216216
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
217-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
217+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
218218
</Dependency>
219-
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="7.0.17-servicing.24116.13">
219+
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="7.0.18-servicing.24169.24">
220220
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
221-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
221+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
222222
</Dependency>
223-
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="7.0.17-servicing.24116.13">
223+
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="7.0.18-servicing.24169.24">
224224
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
225-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
225+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
226226
</Dependency>
227227
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.23330.1">
228228
<Uri>https://github.com/dotnet/razor</Uri>
@@ -241,21 +241,21 @@
241241
<Uri>https://github.com/dotnet/razor</Uri>
242242
<Sha>0ab18affdf2a37647768d0e25f5f021bee6257a1</Sha>
243243
</Dependency>
244-
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.17">
244+
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.18">
245245
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
246-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
246+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="7.0.17">
248+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="7.0.18">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
250-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
250+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="7.0.17">
252+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="7.0.18">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
254-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
254+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.JSInterop" Version="7.0.17">
256+
<Dependency Name="Microsoft.JSInterop" Version="7.0.18">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
258-
<Sha>d0ca5a8d20ac50a33d5451e998a5d411a810c8d7</Sha>
258+
<Sha>f050ae044be8bddc002ab88736e4bf78dc822122</Sha>
259259
</Dependency>
260260
<Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
261261
<Uri>https://github.com/dotnet/xdt</Uri>

0 commit comments

Comments
 (0)