Skip to content

Commit

Permalink
Merge dotnet/main into feature/freebsd-port/outputrid
Browse files Browse the repository at this point in the history
  • Loading branch information
am11 committed Aug 29, 2024
2 parents e544b0e + aaec1c4 commit d90f407
Show file tree
Hide file tree
Showing 1,169 changed files with 13,354 additions and 8,578 deletions.
1 change: 1 addition & 0 deletions docs/design/datacontracts/RuntimeTypeSystem.md
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ The contract additionally depends on these data descriptors
| `FnPtrTypeDesc` | `NumArgs` | Number of arguments to the function described by the `TypeDesc` |
| `FnPtrTypeDesc` | `CallConv` | Lower 8 bits is the calling convention bit as extracted by the signature that defines this `TypeDesc` |
| `FnPtrTypeDesc` | `RetAndArgTypes` | Pointer to an array of TypeHandle addresses. This length of this is 1 more than `NumArgs` |
| `GenericsDictInfo` | `NumDicts` | Number of instantiation dictionaries, including inherited ones, in this `GenericsDictInfo` |
| `GenericsDictInfo` | `NumTypeArgs` | Number of type arguments in the type or method instantiation described by this `GenericsDictInfo` |


Expand Down
24 changes: 12 additions & 12 deletions docs/tools/illink/data-formats.md
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
<type fullname="Assembly.A">
<field name="MyTypeField">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>DefaultConstructor</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
</attribute>
</field>
</type>
Expand All @@ -398,7 +398,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
<type fullname="Assembly.A">
<property name="MyTypeProperty">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>DefaultConstructor</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
</attribute>
</property>
</type>
Expand All @@ -414,7 +414,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
<type fullname="Assembly.A">
<event name="MyTypeEvent">
<attribute fullname="CustomAttribute" assembly="AssemblyName">
<argument>DefaultConstructor</argument>
<argument>ArgumentValue</argument>
</attribute>
</event>
</type>
Expand All @@ -431,21 +431,21 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
<method signature="System.Void Method1(System.Type)">
<parameter name="typeParameter">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>DefaultConstructor</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
</attribute>
</parameter>
</method>
<method signature="System.Type Method2()">
<return>
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>PublicConstructors</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicConstructors</argument>
</attribute>
</return>
</method>
<method signature="Method3&lt;T&gt;(T)">
<parameter name="genericParameter">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>DefaultConstructor</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
</attribute>
</parameter>
</method>
Expand All @@ -463,17 +463,17 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
<method signature="System.Void Method1(System.Type, System.Type, System.Type)">
<parameter name="typeParameter1">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>DefaultConstructor</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
</attribute>
</parameter>
<parameter name="typeParameter2">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>DefaultConstructor</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
</attribute>
</parameter>
<parameter name="typeParameter3">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>PublicConstructors</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicConstructors</argument>
</attribute>
</parameter>
</method>
Expand All @@ -491,7 +491,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
<type name="NestedType">
<property name="MyTypeField">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>DefaultConstructor</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
</attribute>
</property>
</type>
Expand All @@ -507,7 +507,7 @@ This allows to add a custom attribute to a class, interface, delegate, struct or
<assembly fullname="*">
<type fullname="Namespace.SpecialAttribute">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>DefaultConstructor</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">DefaultConstructor</argument>
</attribute>
</type>
</assembly>
Expand All @@ -528,7 +528,7 @@ attributes are applied.
<method signature="System.String TestMethod()">
<return>
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute" assembly="System.Runtime">
<argument>PublicConstructors</argument>
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicConstructors</argument>
</attribute>
</return>
</method>
Expand Down
7 changes: 3 additions & 4 deletions eng/Subsets.props
Original file line number Diff line number Diff line change
Expand Up @@ -538,14 +538,12 @@
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'" Include="$(InstallerProjectRoot)pkg\archives\dotnet-nethost.proj" />
<SharedFrameworkProjectToBuild Condition="'$(MonoCrossAOTTargetOS)' != ''" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\monocrossaot.sfxproj" Pack="true" />
</ItemGroup>
<ItemGroup>
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="packs" Condition="'$(BuildNativeAotAfterPacks)' == 'true'" />
<ProjectToBuild Condition="'$(NativeAotSupported)' == 'true' and '$(RuntimeFlavor)' != 'Mono' and '$(BuildOnlyPgoInstrumentedAssets)' != 'true'" Include="$(InstallerProjectRoot)\pkg\projects\nativeaot-packages.proj" Category="packs" />
</ItemGroup>
<ItemGroup>
<SharedFrameworkProjectToBuild Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.sfxproj" />
<SharedFrameworkProjectToBuild Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Bundle.bundleproj" />
<ProjectToBuild Include="@(SharedFrameworkProjectToBuild)" Category="packs" />
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="packs" Condition="$(_subset.Contains('+clr.tools+')) and '$(TargetsMobile)' != 'true' and '$(NativeAotSupported)' == 'true' and '$(BuildNativeAotAfterPacks)' == 'true'" />
<ProjectToBuild Condition="'$(NativeAotSupported)' == 'true' and '$(RuntimeFlavor)' != 'Mono' and '$(BuildOnlyPgoInstrumentedAssets)' != 'true'" Include="$(InstallerProjectRoot)\pkg\projects\nativeaot-packages.proj" Category="packs" />
</ItemGroup>
</When>
</Choose>
Expand Down Expand Up @@ -589,6 +587,7 @@
<AdditionalProperties Condition="'%(ProjectToBuild.Category)' == 'tools'">%(AdditionalProperties);Configuration=$(ToolsConfiguration)</AdditionalProperties>

<!-- Propagate configurations for cross-subset builds -->
<AdditionalProperties>%(AdditionalProperties);RuntimeConfiguration=$(RuntimeConfiguration)</AdditionalProperties>
<AdditionalProperties>%(AdditionalProperties);LibrariesConfiguration=$(LibrariesConfiguration)</AdditionalProperties>
<AdditionalProperties>%(AdditionalProperties);HostConfiguration=$(HostConfiguration)</AdditionalProperties>
<AdditionalProperties>%(AdditionalProperties);TasksConfiguration=$(TasksConfiguration)</AdditionalProperties>
Expand Down
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,20 @@
<Sha>c667bfea9cdbc5b5493e49e7ddc8dd635a217891</Sha>
<SourceBuild RepoName="cecil" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="10.0.0-alpha.1.24421.1">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="10.0.0-alpha.1.24422.3">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>54f01aca86de85ddb252610ccd7d070d1efece7c</Sha>
<Sha>9a42b800fc36b40b1c3831009137bd33accf32eb</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-alpha.1.24421.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-alpha.1.24422.3">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>54f01aca86de85ddb252610ccd7d070d1efece7c</Sha>
<Sha>9a42b800fc36b40b1c3831009137bd33accf32eb</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24419.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24421.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>c818c3cf018e7aa9fd31f6aed5d14e9b59f03e4f</Sha>
<Sha>bdd698774daa248301c236f09b97015610ca2842</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
Expand All @@ -88,87 +88,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24419.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -328,9 +328,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>69f15217657bc3a7f0102911aa967525529fdfdb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24409.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
Loading

0 comments on commit d90f407

Please sign in to comment.