Skip to content

Commit 473ae07

Browse files
authored
Merge branch 'main' into dev/Jason/mergeToMain
2 parents 5dc88fc + 0113afe commit 473ae07

File tree

17 files changed

+204
-173
lines changed

17 files changed

+204
-173
lines changed

Directory.Build.targets

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
4+
<PropertyGroup>
5+
<!--
6+
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
7+
This condition will be evaluated multiple times in multi-targeted projects hence need to be careful
8+
to only set in the inner builds, not the outer build where only $(TargetFrameworks) is defined.
9+
We still check $(TargetFrameworks) for empty though, because for single-targeted builds we want to
10+
allow nullable warnings regardless of target framework.
11+
-->
12+
<NoWarn Condition="'$(DisableNullableWarnings)' == '' AND '$(TargetFrameworks)' != '' AND '$(TargetFramework)' != '' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">$(NoWarn);Nullable</NoWarn>
13+
</PropertyGroup>
414

515
<ItemGroup>
616
<SupportedPlatform Remove="Android" />

eng/Version.Details.xml

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,46 @@
1515
<Sha>ed18af72023b6abf81d68840b0025b1d29e0dc33</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
18-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.24610.2">
18+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.24612.1">
1919
<Uri>https://github.com/dotnet/runtime</Uri>
20-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
20+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
2121
</Dependency>
22-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24610.2">
22+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24612.1">
2323
<Uri>https://github.com/dotnet/runtime</Uri>
24-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
24+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
2525
</Dependency>
26-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24610.2">
26+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24612.1">
2727
<Uri>https://github.com/dotnet/runtime</Uri>
28-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
28+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-alpha.1.24610.2">
30+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-alpha.1.24612.1">
3131
<Uri>https://github.com/dotnet/runtime</Uri>
32-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
32+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="10.0.0-alpha.1.24610.2">
34+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="10.0.0-alpha.1.24612.1">
3535
<Uri>https://github.com/dotnet/runtime</Uri>
36-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
36+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-alpha.1.24610.2">
38+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-alpha.1.24612.1">
3939
<Uri>https://github.com/dotnet/runtime</Uri>
40-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
40+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.NET.HostModel" Version="10.0.0-alpha.1.24610.2">
42+
<Dependency Name="Microsoft.NET.HostModel" Version="10.0.0-alpha.1.24612.1">
4343
<Uri>https://github.com/dotnet/runtime</Uri>
44-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
44+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
4545
</Dependency>
46-
<Dependency Name="System.IO.Hashing" Version="10.0.0-alpha.1.24610.2">
46+
<Dependency Name="System.IO.Hashing" Version="10.0.0-alpha.1.24612.1">
4747
<Uri>https://github.com/dotnet/runtime</Uri>
48-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
48+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-alpha.1.24610.2">
50+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-alpha.1.24612.1">
5151
<Uri>https://github.com/dotnet/runtime</Uri>
52-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
52+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
5353
</Dependency>
5454
<!-- Intermediate is necessary for source build. -->
55-
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="10.0.0-alpha.1.24610.2">
55+
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="10.0.0-alpha.1.24612.1">
5656
<Uri>https://github.com/dotnet/runtime</Uri>
57-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
57+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
5858
<SourceBuild RepoName="runtime" ManagedOnly="false" />
5959
</Dependency>
6060
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
@@ -230,29 +230,29 @@
230230
<Sha>fc785088a28006c774dcfe0916b69ff54e6f99c1</Sha>
231231
<SourceBuild RepoName="vstest" ManagedOnly="true" />
232232
</Dependency>
233-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.24610.2">
233+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.24612.1">
234234
<Uri>https://github.com/dotnet/runtime</Uri>
235-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
235+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
236236
</Dependency>
237-
<Dependency Name="System.CodeDom" Version="10.0.0-alpha.1.24610.2">
237+
<Dependency Name="System.CodeDom" Version="10.0.0-alpha.1.24612.1">
238238
<Uri>https://github.com/dotnet/runtime</Uri>
239-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
239+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
240240
</Dependency>
241-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-alpha.1.24610.2">
241+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-alpha.1.24612.1">
242242
<Uri>https://github.com/dotnet/runtime</Uri>
243-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
243+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
244244
</Dependency>
245-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.0-alpha.1.24610.2">
245+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.0-alpha.1.24612.1">
246246
<Uri>https://github.com/dotnet/runtime</Uri>
247-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
247+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
248248
</Dependency>
249-
<Dependency Name="System.Text.Encoding.CodePages" Version="10.0.0-alpha.1.24610.2">
249+
<Dependency Name="System.Text.Encoding.CodePages" Version="10.0.0-alpha.1.24612.1">
250250
<Uri>https://github.com/dotnet/runtime</Uri>
251-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
251+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
252252
</Dependency>
253-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-alpha.1.24610.2">
253+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-alpha.1.24612.1">
254254
<Uri>https://github.com/dotnet/runtime</Uri>
255-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
255+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
256256
</Dependency>
257257
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24607.1">
258258
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -473,89 +473,89 @@
473473
<SourceBuild RepoName="symreader" ManagedOnly="true" />
474474
</Dependency>
475475
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
476-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-alpha.1.24610.2">
476+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-alpha.1.24612.1">
477477
<Uri>https://github.com/dotnet/runtime</Uri>
478-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
478+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
479479
</Dependency>
480480
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
481-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-alpha.1.24610.2">
481+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-alpha.1.24612.1">
482482
<Uri>https://github.com/dotnet/runtime</Uri>
483-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
483+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
484484
</Dependency>
485485
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
486-
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.0-alpha.1.24610.2">
486+
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.0-alpha.1.24612.1">
487487
<Uri>https://github.com/dotnet/runtime</Uri>
488-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
488+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
489489
</Dependency>
490490
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
491-
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0-alpha.1.24610.2">
491+
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0-alpha.1.24612.1">
492492
<Uri>https://github.com/dotnet/runtime</Uri>
493-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
493+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
494494
</Dependency>
495495
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
496-
<Dependency Name="System.ServiceProcess.ServiceController" Version="10.0.0-alpha.1.24610.2">
496+
<Dependency Name="System.ServiceProcess.ServiceController" Version="10.0.0-alpha.1.24612.1">
497497
<Uri>https://github.com/dotnet/runtime</Uri>
498-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
498+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
499499
</Dependency>
500-
<Dependency Name="System.Text.Json" Version="10.0.0-alpha.1.24610.2">
500+
<Dependency Name="System.Text.Json" Version="10.0.0-alpha.1.24612.1">
501501
<Uri>https://github.com/dotnet/runtime</Uri>
502-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
502+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
503503
</Dependency>
504-
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-alpha.1.24610.2">
504+
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-alpha.1.24612.1">
505505
<Uri>https://github.com/dotnet/runtime</Uri>
506-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
506+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
507507
</Dependency>
508-
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0-alpha.1.24610.2">
508+
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0-alpha.1.24612.1">
509509
<Uri>https://github.com/dotnet/runtime</Uri>
510-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
510+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
511511
</Dependency>
512512
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.24611.1">
513513
<Uri>https://github.com/dotnet/aspnetcore</Uri>
514514
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
515515
</Dependency>
516-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-alpha.1.24610.2">
516+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-alpha.1.24612.1">
517517
<Uri>https://github.com/dotnet/runtime</Uri>
518-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
518+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
519519
</Dependency>
520-
<Dependency Name="System.Composition.AttributedModel" Version="10.0.0-alpha.1.24610.2">
520+
<Dependency Name="System.Composition.AttributedModel" Version="10.0.0-alpha.1.24612.1">
521521
<Uri>https://github.com/dotnet/runtime</Uri>
522-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
522+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
523523
</Dependency>
524-
<Dependency Name="System.Composition.Convention" Version="10.0.0-alpha.1.24610.2">
524+
<Dependency Name="System.Composition.Convention" Version="10.0.0-alpha.1.24612.1">
525525
<Uri>https://github.com/dotnet/runtime</Uri>
526-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
526+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
527527
</Dependency>
528-
<Dependency Name="System.Composition.Hosting" Version="10.0.0-alpha.1.24610.2">
528+
<Dependency Name="System.Composition.Hosting" Version="10.0.0-alpha.1.24612.1">
529529
<Uri>https://github.com/dotnet/runtime</Uri>
530-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
530+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
531531
</Dependency>
532-
<Dependency Name="System.Composition.Runtime" Version="10.0.0-alpha.1.24610.2">
532+
<Dependency Name="System.Composition.Runtime" Version="10.0.0-alpha.1.24612.1">
533533
<Uri>https://github.com/dotnet/runtime</Uri>
534-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
534+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
535535
</Dependency>
536-
<Dependency Name="System.Composition.TypedParts" Version="10.0.0-alpha.1.24610.2">
536+
<Dependency Name="System.Composition.TypedParts" Version="10.0.0-alpha.1.24612.1">
537537
<Uri>https://github.com/dotnet/runtime</Uri>
538-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
538+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
539539
</Dependency>
540-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-alpha.1.24610.2">
540+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-alpha.1.24612.1">
541541
<Uri>https://github.com/dotnet/runtime</Uri>
542-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
542+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
543543
</Dependency>
544-
<Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0-alpha.1.24610.2">
544+
<Dependency Name="System.Security.Cryptography.Pkcs" Version="10.0.0-alpha.1.24612.1">
545545
<Uri>https://github.com/dotnet/runtime</Uri>
546-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
546+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
547547
</Dependency>
548-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-alpha.1.24610.2">
548+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-alpha.1.24612.1">
549549
<Uri>https://github.com/dotnet/runtime</Uri>
550-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
550+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
551551
</Dependency>
552-
<Dependency Name="System.Security.Permissions" Version="10.0.0-alpha.1.24610.2">
552+
<Dependency Name="System.Security.Permissions" Version="10.0.0-alpha.1.24612.1">
553553
<Uri>https://github.com/dotnet/runtime</Uri>
554-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
554+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
555555
</Dependency>
556-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-alpha.1.24610.2">
556+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-alpha.1.24612.1">
557557
<Uri>https://github.com/dotnet/runtime</Uri>
558-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
558+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
559559
</Dependency>
560560
</ProductDependencies>
561561
<ToolsetDependencies>
@@ -589,9 +589,9 @@
589589
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
590590
<SourceBuild RepoName="arcade" ManagedOnly="true" />
591591
</Dependency>
592-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24610.2">
592+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24612.1">
593593
<Uri>https://github.com/dotnet/runtime</Uri>
594-
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
594+
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
595595
</Dependency>
596596
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24609.2">
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>

0 commit comments

Comments
 (0)