Skip to content

Commit 41ce72b

Browse files
committed
Merge branch 'main' into dev/grendel/android-build-with-ndk
* main: (89 commits) Add Dispose for X509Chain instance (dotnet#110740) Fix XML comment on regex split enumerator (dotnet#111572) JIT: tolerate missing InitClass map in SPMI (dotnet#111555) Build ilasm/ildasm packages for the host machine (dotnet#111512) Unicode 16.0 Support (dotnet#111469) Improve performance of interface method resolution in ILC (dotnet#103066) Fix building the host-targeting components and packing ILC (dotnet#111552) Improve JSON validation perf (dotnet#111332) Update github-merge-flow.jsonc to autoflow 9.0 to 9.0-staging (dotnet#111549) Include GPL-3 licence text in the notice (dotnet#111528) Remove explicit __compact_unwind entries from x64 assembler (dotnet#111530) Add MemoryExtensions overloads with comparer (dotnet#110197) Avoid capturing the ExecutionContext for the whole HTTP connection lifetime (dotnet#111475) Forward DefaultArtifactVisibility down from the VMR orchestrator (dotnet#111513) Fix relocs errors on riscv64 (dotnet#111317) Added JITDUMP_USE_ARCH_TIMESTAMP support. (dotnet#111359) add rcl/rcr tp and latency info (dotnet#111442) Fix stack overflow in compiler-generated state (dotnet#109207) Produce a package with the host-running ILC for repos in the VMR (dotnet#111443) Delete dead code in ilasm PE writer (dotnet#111218) ...
2 parents 5a94dea + af25787 commit 41ce72b

File tree

580 files changed

+21193
-7010
lines changed

Some content is hidden

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

580 files changed

+21193
-7010
lines changed

Directory.Build.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@
5454
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v$(NETCoreAppMaximumVersion)" DisplayName=".NET $(NETCoreAppMaximumVersion)" Alias="net$(NETCoreAppMaximumVersion)" />
5555
</ItemGroup>
5656

57+
<PropertyGroup>
58+
<!-- Define properties that depend on the host SDK RID here. -->
59+
<BuildHostTools Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
60+
<BuildHostILTools Condition="'$(BuildHostTools)' == 'true' and $([MSBuild]::IsOsPlatform(Windows))">true</BuildHostILTools>
61+
</PropertyGroup>
62+
5763
<!-- The Default behavior in VS is to show files for the first target framework in TargetFrameworks property.
5864
This is required to show all the files corresponding to all target frameworks in VS. -->
5965
<ItemGroup Condition="'$(DefaultLanguageSourceExtension)' != '' and

THIRD-PARTY-NOTICES.TXT

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,37 +34,36 @@ License notice for Unicode data
3434

3535
https://www.unicode.org/license.html
3636

37-
Copyright © 1991-2022 Unicode, Inc. All rights reserved.
37+
Copyright © 1991-2024 Unicode, Inc. All rights reserved.
3838
Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
3939

40-
Permission is hereby granted, free of charge, to any person obtaining
41-
a copy of the Unicode data files and any associated documentation
42-
(the "Data Files") or Unicode software and any associated documentation
43-
(the "Software") to deal in the Data Files or Software
44-
without restriction, including without limitation the rights to use,
45-
copy, modify, merge, publish, distribute, and/or sell copies of
46-
the Data Files or Software, and to permit persons to whom the Data Files
47-
or Software are furnished to do so, provided that either
48-
(a) this copyright and permission notice appear with all copies
49-
of the Data Files or Software, or
50-
(b) this copyright and permission notice appear in associated
51-
Documentation.
52-
53-
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
54-
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
55-
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
56-
NONINFRINGEMENT OF THIRD PARTY RIGHTS.
57-
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
58-
NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
59-
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
60-
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
61-
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
62-
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
63-
64-
Except as contained in this notice, the name of a copyright holder
65-
shall not be used in advertising or otherwise to promote the sale,
66-
use or other dealings in these Data Files or Software without prior
67-
written authorization of the copyright holder.
40+
Permission is hereby granted, free of charge, to any person obtaining a
41+
copy of data files and any associated documentation (the "Data Files") or
42+
software and any associated documentation (the "Software") to deal in the
43+
Data Files or Software without restriction, including without limitation
44+
the rights to use, copy, modify, merge, publish, distribute, and/or sell
45+
copies of the Data Files or Software, and to permit persons to whom the
46+
Data Files or Software are furnished to do so, provided that either (a)
47+
this copyright and permission notice appear with all copies of the Data
48+
Files or Software, or (b) this copyright and permission notice appear in
49+
associated Documentation.
50+
51+
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
52+
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
53+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
54+
THIRD PARTY RIGHTS.
55+
56+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
57+
BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
58+
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
59+
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
60+
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
61+
FILES OR SOFTWARE.
62+
63+
Except as contained in this notice, the name of a copyright holder shall
64+
not be used in advertising or otherwise to promote the sale, use or other
65+
dealings in these Data Files or Software without prior written
66+
authorization of the copyright holder.
6867

6968
License notice for zlib-ng
7069
-----------------------

eng/DotNetBuild.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<InnerBuildArgs Condition="'$(PortableBuild)' != ''">$(InnerBuildArgs) /p:PortableBuild=$(PortableBuild)</InnerBuildArgs>
8989
<InnerBuildArgs Condition="'$(RestoreConfigFile)' != ''">$(InnerBuildArgs) /p:RestoreConfigFile=$(RestoreConfigFile)</InnerBuildArgs>
9090
<InnerBuildArgs Condition="'$(ForceDryRunSigning)' != ''">$(InnerBuildArgs) /p:ForceDryRunSigning=$(ForceDryRunSigning)</InnerBuildArgs>
91+
<InnerBuildArgs Condition="'$(DefaultArtifactVisibility)' != ''">$(InnerBuildArgs) /p:DefaultArtifactVisibility=$(DefaultArtifactVisibility)</InnerBuildArgs>
9192

9293
<!-- Pass locations for assets, packages and symbols -->
9394
<InnerBuildArgs Condition="'$(SourceBuiltAssetsDir)' != ''">$(InnerBuildArgs) /p:SourceBuiltAssetsDir=$(SourceBuiltAssetsDir)</InnerBuildArgs>

eng/Publishing.props

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,22 @@
1212
Mark assets as Vertical visibility when building in the VMR
1313
-->
1414
<ItemGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
15+
<Artifact Condition="'$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'"
16+
Update="$(ArtifactsPackagesDir)**\runtime.$(NETCoreSdkRuntimeIdentifier).Microsoft.NETCore.ILAsm.*.nupkg"
17+
Visibility="Vertical"
18+
IsShipping="false" />
19+
<Artifact Condition="'$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'"
20+
Update="$(ArtifactsPackagesDir)**\runtime.$(NETCoreSdkRuntimeIdentifier).Microsoft.NETCore.ILDAsm.*.nupkg"
21+
Visibility="Vertical"
22+
IsShipping="false" />
1523
<Artifact Condition="'$(RuntimeFlavor)' != 'Mono' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'"
1624
Update="$(ArtifactsPackagesDir)**\Microsoft.NETCore.App.Crossgen2.$(NETCoreSdkRuntimeIdentifier).*.nupkg"
17-
Visibility="Vertical" />
25+
Visibility="Vertical"
26+
IsShipping="false" />
27+
<Artifact Condition="'$(RuntimeFlavor)' != 'Mono' and '$(OutputRID)' != '$(NETCoreSdkRuntimeIdentifier)'"
28+
Update="$(ArtifactsPackagesDir)**\runtime.$(NETCoreSDKRuntimeIdentifier).Microsoft.DotNet.ILCompiler.*.nupkg"
29+
Visibility="Vertical"
30+
IsShipping="false" />
1831
</ItemGroup>
1932

2033
<!--

0 commit comments

Comments
 (0)