Skip to content

Commit d2410c4

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-ee8a65cf-b17c-4cad-a155-65e050ae0f3d
2 parents 01dc1d2 + c02d3f4 commit d2410c4

File tree

11 files changed

+188
-122
lines changed

11 files changed

+188
-122
lines changed

‎Directory.Build.targets‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Project>
44
<PropertyGroup>
55
<!--
6-
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
6+
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
77
This condition will be evaluated multiple times in multi-targeted projects hence need to be careful
88
to only set in the inner builds, not the outer build where only $(TargetFrameworks) is defined.
99
We still check $(TargetFrameworks) for empty though, because for single-targeted builds we want to
@@ -67,6 +67,10 @@
6767
Update="Microsoft.NETCore.App"
6868
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
6969
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
70+
<KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler"
71+
ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
72+
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2"
73+
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
7074
</ItemGroup>
7175

7276
<ItemGroup Condition="$(MicrosoftAspNetCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))">

‎eng/Version.Details.xml‎

Lines changed: 93 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="10.0.100-alpha.1.25062.9">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="10.0.100-alpha.1.25064.3">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>4a9cd8c45d20e89f5230050bf34492964f2260cb</Sha>
6+
<Sha>130f01eed959cbfe329cab2abcde501a1699df50</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="10.0.100-alpha.1.25062.9">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="10.0.100-alpha.1.25064.3">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>4a9cd8c45d20e89f5230050bf34492964f2260cb</Sha>
10+
<Sha>130f01eed959cbfe329cab2abcde501a1699df50</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="10.0.100-alpha.1.25062.9">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="10.0.100-alpha.1.25064.3">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>4a9cd8c45d20e89f5230050bf34492964f2260cb</Sha>
15+
<Sha>130f01eed959cbfe329cab2abcde501a1699df50</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.25063.12">
@@ -73,18 +73,18 @@
7373
<Sha>0de3165cb0d56323b6caaf8e9916d4d9e72da32d</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25063-01">
76+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25064-11">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>f69d764639f8b6f1d49d543b44f1fdbe24d38c37</Sha>
78+
<Sha>01477742a8fdabf862ae86e5da78ccbd201e89e1</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25063-01">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25064-11">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>f69d764639f8b6f1d49d543b44f1fdbe24d38c37</Sha>
82+
<Sha>01477742a8fdabf862ae86e5da78ccbd201e89e1</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25063-01">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25064-11">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>f69d764639f8b6f1d49d543b44f1fdbe24d38c37</Sha>
87+
<Sha>01477742a8fdabf862ae86e5da78ccbd201e89e1</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.200-beta.25056.5">
@@ -97,43 +97,43 @@
9797
<Sha>63a09289745da5c256e7baf5f4194a750b1ec878</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25057.3">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-1.25064.9">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
102+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25057.3">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-1.25064.9">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
107+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25057.3">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-1.25064.9">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
112+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25057.3">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-1.25064.9">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
116+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25057.3">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-1.25064.9">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
120+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25057.3">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-1.25064.9">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
124+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25057.3">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-1.25064.9">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
128+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25057.3">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-1.25064.9">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
132+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25057.3">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-1.25064.9">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
136+
<Sha>6b364f666a4014bc8269131ef30df18c16a83511</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25065.2">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -307,10 +307,51 @@
307307
<Uri>https://github.com/dotnet/aspnetcore</Uri>
308308
<Sha>c4c8d3a692d2ea94e945276825bb4e7a0b564a3d</Sha>
309309
</Dependency>
310+
<!-- Authentication and Components needed for dotnet/maui CoherentParentDependency -->
311+
<Dependency Name="Microsoft.AspNetCore.Authentication.Facebook" Version="10.0.0-alpha.2.25064.2">
312+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
313+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
314+
</Dependency>
315+
<Dependency Name="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0-alpha.2.25064.2">
316+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
317+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
318+
</Dependency>
319+
<Dependency Name="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="10.0.0-alpha.2.25064.2">
320+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
321+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
322+
</Dependency>
323+
<Dependency Name="Microsoft.AspNetCore.Components" Version="10.0.0-alpha.2.25064.2">
324+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
325+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
326+
</Dependency>
327+
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="10.0.0-alpha.2.25064.2">
328+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
329+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
330+
</Dependency>
331+
<Dependency Name="Microsoft.AspNetCore.Components.Forms" Version="10.0.0-alpha.2.25064.2">
332+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
333+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
334+
</Dependency>
335+
<Dependency Name="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-alpha.2.25064.2">
336+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
337+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
338+
</Dependency>
339+
<Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0-alpha.2.25064.2">
340+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
341+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
342+
</Dependency>
310343
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.25065.2">
311344
<Uri>https://github.com/dotnet/aspnetcore</Uri>
312345
<Sha>c4c8d3a692d2ea94e945276825bb4e7a0b564a3d</Sha>
313346
</Dependency>
347+
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="10.0.0-alpha.2.25062.2">
348+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
349+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
350+
</Dependency>
351+
<Dependency Name="Microsoft.AspNetCore.Metadata" Version="10.0.0-alpha.2.25064.2">
352+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
353+
<Sha>d4880ed4160b476346850ac653ce4b829ab09c94</Sha>
354+
</Dependency>
314355
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.25065.2">
315356
<Uri>https://github.com/dotnet/aspnetcore</Uri>
316357
<Sha>c4c8d3a692d2ea94e945276825bb4e7a0b564a3d</Sha>
@@ -421,43 +462,43 @@
421462
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
422463
</Dependency>
423464
<!-- Intermediate is necessary for source build. -->
424-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.606303">
465+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.606402">
425466
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
426-
<Sha>72a9d7fde1a2c29e94526085a3b981389da86eb3</Sha>
467+
<Sha>43f2c55c61e6233cc1a5c0d162359367aad8975b</Sha>
427468
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
428469
</Dependency>
429470
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24630.1">
430471
<Uri>https://github.com/dotnet/deployment-tools</Uri>
431472
<Sha>c7bcd7d32f7744af89dfd031a9b2085e3004fd9c</Sha>
432473
</Dependency>
433-
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.25061.1">
474+
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.25064.1">
434475
<Uri>https://github.com/dotnet/sourcelink</Uri>
435-
<Sha>5ea73491228574eb803a676a7248b3fc9e602d4d</Sha>
476+
<Sha>36148468d5b0bd5041b3b8276b4706872fd07996</Sha>
436477
</Dependency>
437-
<Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.25061.1">
478+
<Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.25064.1">
438479
<Uri>https://github.com/dotnet/sourcelink</Uri>
439-
<Sha>5ea73491228574eb803a676a7248b3fc9e602d4d</Sha>
480+
<Sha>36148468d5b0bd5041b3b8276b4706872fd07996</Sha>
440481
</Dependency>
441-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.25061.1">
482+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.25064.1">
442483
<Uri>https://github.com/dotnet/sourcelink</Uri>
443-
<Sha>5ea73491228574eb803a676a7248b3fc9e602d4d</Sha>
484+
<Sha>36148468d5b0bd5041b3b8276b4706872fd07996</Sha>
444485
</Dependency>
445-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.25061.1">
486+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.25064.1">
446487
<Uri>https://github.com/dotnet/sourcelink</Uri>
447-
<Sha>5ea73491228574eb803a676a7248b3fc9e602d4d</Sha>
488+
<Sha>36148468d5b0bd5041b3b8276b4706872fd07996</Sha>
448489
</Dependency>
449-
<Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.25061.1">
490+
<Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.25064.1">
450491
<Uri>https://github.com/dotnet/sourcelink</Uri>
451-
<Sha>5ea73491228574eb803a676a7248b3fc9e602d4d</Sha>
492+
<Sha>36148468d5b0bd5041b3b8276b4706872fd07996</Sha>
452493
</Dependency>
453-
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.25061.1">
494+
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.25064.1">
454495
<Uri>https://github.com/dotnet/sourcelink</Uri>
455-
<Sha>5ea73491228574eb803a676a7248b3fc9e602d4d</Sha>
496+
<Sha>36148468d5b0bd5041b3b8276b4706872fd07996</Sha>
456497
</Dependency>
457498
<!-- Intermediate is necessary for source build. -->
458-
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.25061.1">
499+
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.25064.1">
459500
<Uri>https://github.com/dotnet/sourcelink</Uri>
460-
<Sha>5ea73491228574eb803a676a7248b3fc9e602d4d</Sha>
501+
<Sha>36148468d5b0bd5041b3b8276b4706872fd07996</Sha>
461502
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
462503
</Dependency>
463504
<!-- Intermediate is necessary for source build. -->
@@ -634,9 +675,13 @@
634675
<Uri>https://github.com/dotnet/runtime</Uri>
635676
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
636677
</Dependency>
637-
<Dependency Name="MSTest" Version="3.8.0-preview.25057.8">
678+
<Dependency Name="Microsoft.Testing.Platform" Version="1.6.0-preview.25064.5">
679+
<Uri>https://github.com/microsoft/testfx</Uri>
680+
<Sha>260ef988f3e05e51c390cf77cbd4acf21b10c609</Sha>
681+
</Dependency>
682+
<Dependency Name="MSTest" Version="3.8.0-preview.25064.5">
638683
<Uri>https://github.com/microsoft/testfx</Uri>
639-
<Sha>53488cf463d33882113ca7a6fbbb6f93e06251df</Sha>
684+
<Sha>260ef988f3e05e51c390cf77cbd4acf21b10c609</Sha>
640685
</Dependency>
641686
</ToolsetDependencies>
642687
</Dependencies>

0 commit comments

Comments
 (0)