Skip to content

Commit be6323f

Browse files
MiYanniMiYanni
committed
Merge branch 'main' into CoreSdkTasksTestsOnHelix
# Conflicts: # test/UnitTests.proj
2 parents 573b453 + f86f545 commit be6323f

File tree

92 files changed

+424
-5200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+424
-5200
lines changed

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<UsagePattern IdentityGlob="System.Composition.Runtime/*7.0.0*" />
3333
<UsagePattern IdentityGlob="System.Composition.TypedParts/*7.0.0*" />
3434
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
35+
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
3536
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
3637
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
3738
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

‎eng/Version.Details.xml

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>99ea0c06b84d3084d090da537080dd35d2a193cf</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24366-01">
72+
<Dependency Name="Microsoft.Build" Version="17.12.0-preview-24368-09">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>978323a418db02ba00b80cb644511fca9a189121</Sha>
74+
<Sha>fb48b92ae74b61c678d1406e6faa2cb73e264075</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24366-01">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.0-preview-24368-09">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>978323a418db02ba00b80cb644511fca9a189121</Sha>
78+
<Sha>fb48b92ae74b61c678d1406e6faa2cb73e264075</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24366-01">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.0-preview-24368-09">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>978323a418db02ba00b80cb644511fca9a189121</Sha>
83+
<Sha>fb48b92ae74b61c678d1406e6faa2cb73e264075</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.400-beta.24351.2">
@@ -131,13 +131,13 @@
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132132
<Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-preview.7.24366.8">
134+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-preview.7.24368.11">
135135
<Uri>https://github.com/dotnet/aspnetcore</Uri>
136-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
136+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
137137
</Dependency>
138-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-preview.7.24366.8">
138+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-preview.7.24368.11">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
140-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
140+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
141141
</Dependency>
142142
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.12.0-preview.1.32">
143143
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -246,75 +246,75 @@
246246
<Uri>https://github.com/dotnet/runtime</Uri>
247247
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24367.1">
249+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24368.1">
250250
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
251-
<Sha>2d20241abb82bcb4e7941e0ced8c873920588887</Sha>
251+
<Sha>90f32e0fbb8fdcb9701942a0ea973ad4fe4883e7</Sha>
252252
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
253253
</Dependency>
254-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24367.1">
254+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24368.1">
255255
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
256-
<Sha>2d20241abb82bcb4e7941e0ced8c873920588887</Sha>
256+
<Sha>90f32e0fbb8fdcb9701942a0ea973ad4fe4883e7</Sha>
257257
</Dependency>
258-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24367.1">
258+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24368.1">
259259
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
260-
<Sha>2d20241abb82bcb4e7941e0ced8c873920588887</Sha>
260+
<Sha>90f32e0fbb8fdcb9701942a0ea973ad4fe4883e7</Sha>
261261
</Dependency>
262-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24367.1">
262+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24368.1">
263263
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
264-
<Sha>2d20241abb82bcb4e7941e0ced8c873920588887</Sha>
264+
<Sha>90f32e0fbb8fdcb9701942a0ea973ad4fe4883e7</Sha>
265265
</Dependency>
266-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24366.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
266+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24367.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
267267
<Uri>https://github.com/dotnet/wpf</Uri>
268-
<Sha>1f2a4a2f92f29e91890261acea9f00e4c9fd6db0</Sha>
268+
<Sha>8529feb7ce7dcb68ef581a2a2e6f8e6bff7290e0</Sha>
269269
</Dependency>
270-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.7.24366.8">
270+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.7.24368.11">
271271
<Uri>https://github.com/dotnet/aspnetcore</Uri>
272-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
272+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
273273
</Dependency>
274-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.7.24366.8">
274+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.7.24368.11">
275275
<Uri>https://github.com/dotnet/aspnetcore</Uri>
276-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
276+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
277277
</Dependency>
278-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.7.24366.8">
278+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.7.24368.11">
279279
<Uri>https://github.com/dotnet/aspnetcore</Uri>
280-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
280+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
281281
</Dependency>
282-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24366.8">
282+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24368.11">
283283
<Uri>https://github.com/dotnet/aspnetcore</Uri>
284-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
284+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
285285
</Dependency>
286-
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.7.24366.8">
286+
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.7.24368.11">
287287
<Uri>https://github.com/dotnet/aspnetcore</Uri>
288-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
288+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
289289
</Dependency>
290-
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.7.24366.8">
290+
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.7.24368.11">
291291
<Uri>https://github.com/dotnet/aspnetcore</Uri>
292-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
292+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
293293
</Dependency>
294-
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.7.24366.8">
294+
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.7.24368.11">
295295
<Uri>https://github.com/dotnet/aspnetcore</Uri>
296-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
296+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
297297
</Dependency>
298-
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="9.0.0-preview.7.24366.8">
298+
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="9.0.0-preview.7.24368.11">
299299
<Uri>https://github.com/dotnet/aspnetcore</Uri>
300-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
300+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
301301
</Dependency>
302-
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="9.0.0-preview.7.24366.8">
302+
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="9.0.0-preview.7.24368.11">
303303
<Uri>https://github.com/dotnet/aspnetcore</Uri>
304-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
304+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
305305
</Dependency>
306-
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="9.0.0-preview.7.24366.8">
306+
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="9.0.0-preview.7.24368.11">
307307
<Uri>https://github.com/dotnet/aspnetcore</Uri>
308-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
308+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
309309
</Dependency>
310-
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="9.0.0-preview.7.24366.8">
310+
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="9.0.0-preview.7.24368.11">
311311
<Uri>https://github.com/dotnet/aspnetcore</Uri>
312-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
312+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
313313
</Dependency>
314314
<!-- Intermediate is necessary for source build. -->
315-
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.7.24366.8">
315+
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.7.24368.11">
316316
<Uri>https://github.com/dotnet/aspnetcore</Uri>
317-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
317+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
318318
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
319319
</Dependency>
320320
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24367.1">
@@ -335,21 +335,21 @@
335335
<Sha>c0b9aa27c6ef613ae1a367ef1d26950e4f0cb626</Sha>
336336
<SourceBuild RepoName="razor" ManagedOnly="true" />
337337
</Dependency>
338-
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-preview.7.24366.8">
338+
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-preview.7.24368.11">
339339
<Uri>https://github.com/dotnet/aspnetcore</Uri>
340-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
340+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
341341
</Dependency>
342-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.7.24366.8">
342+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-preview.7.24368.11">
343343
<Uri>https://github.com/dotnet/aspnetcore</Uri>
344-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
344+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
345345
</Dependency>
346-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.7.24366.8">
346+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-preview.7.24368.11">
347347
<Uri>https://github.com/dotnet/aspnetcore</Uri>
348-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
348+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
349349
</Dependency>
350-
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.7.24366.8">
350+
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-preview.7.24368.11">
351351
<Uri>https://github.com/dotnet/aspnetcore</Uri>
352-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
352+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
353353
</Dependency>
354354
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
355355
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -386,9 +386,9 @@
386386
<Uri>https://github.com/dotnet/winforms</Uri>
387387
<Sha>bb601b3242ccbf5d8a77a44af27a374f677be8d6</Sha>
388388
</Dependency>
389-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24366.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
389+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24367.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
390390
<Uri>https://github.com/dotnet/wpf</Uri>
391-
<Sha>1f2a4a2f92f29e91890261acea9f00e4c9fd6db0</Sha>
391+
<Sha>8529feb7ce7dcb68ef581a2a2e6f8e6bff7290e0</Sha>
392392
</Dependency>
393393
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24317.2">
394394
<Uri>https://github.com/dotnet/xdt</Uri>
@@ -437,9 +437,9 @@
437437
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
438438
</Dependency>
439439
<!-- Intermediate is necessary for source build. -->
440-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24365.1">
440+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24367.1">
441441
<Uri>https://github.com/dotnet/source-build-externals</Uri>
442-
<Sha>65c96a16071bd74ad3c2d455cc235a6f5806376a</Sha>
442+
<Sha>ff7fd0e205df9f2e3651716f92a15b2bb82b80ba</Sha>
443443
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
444444
</Dependency>
445445
<!-- Intermediate is necessary for source build. -->
@@ -531,9 +531,9 @@
531531
<Uri>https://github.com/dotnet/runtime</Uri>
532532
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
533533
</Dependency>
534-
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.7.24366.8">
534+
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.7.24368.11">
535535
<Uri>https://github.com/dotnet/aspnetcore</Uri>
536-
<Sha>ec1594438c33702e564c36252ed11d024b5e6aad</Sha>
536+
<Sha>662d200bc4feb11a01895e675fbfee8517c6fe2a</Sha>
537537
</Dependency>
538538
<Dependency Name="Microsoft.Win32.SystemEvents" Version="9.0.0-preview.7.24366.18">
539539
<Uri>https://github.com/dotnet/runtime</Uri>

0 commit comments

Comments
 (0)