From b9ee162d4446fc62ca0c45edd9c491bfdec5a774 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 13:11:44 +0000
Subject: [PATCH 01/10] Update dependencies from
 https://github.com/dotnet/arcade build 20221223.1 (dotnet/linker#3169)

[main] Update dependencies from dotnet/arcade


Commit migrated from https://github.com/dotnet/linker/commit/afdb20698de0c04eda00dbb778cabdb3c8754fa0
---
 src/tools/illink/eng/Version.Details.xml      |  8 +-
 src/tools/illink/eng/Versions.props           |  2 +-
 .../illink/eng/common/native/init-compiler.sh | 81 +++++++++----------
 .../eng/common/templates/job/onelocbuild.yml  | 14 ++--
 src/tools/illink/eng/common/tools.ps1         |  3 +-
 src/tools/illink/eng/common/tools.sh          |  4 +-
 src/tools/illink/global.json                  |  2 +-
 7 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/src/tools/illink/eng/Version.Details.xml b/src/tools/illink/eng/Version.Details.xml
index 1e70757bce6c3a..58f017af2010e0 100644
--- a/src/tools/illink/eng/Version.Details.xml
+++ b/src/tools/illink/eng/Version.Details.xml
@@ -3,14 +3,14 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22616.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22623.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>57ba56de330e50f9012493b8ba24818e24ec7817</Sha>
+      <Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22616.1">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22623.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>57ba56de330e50f9012493b8ba24818e24ec7817</Sha>
+      <Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-rtm.22507.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/src/tools/illink/eng/Versions.props b/src/tools/illink/eng/Versions.props
index 7016b7c8f7cf9c..eb5355ce2a812a 100644
--- a/src/tools/illink/eng/Versions.props
+++ b/src/tools/illink/eng/Versions.props
@@ -18,7 +18,7 @@
     <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
     <MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion>
-    <MicrosoftDotNetApiCompatVersion>8.0.0-beta.22616.1</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetApiCompatVersion>8.0.0-beta.22623.1</MicrosoftDotNetApiCompatVersion>
     <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion>
     <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
     <MicrosoftCodeAnalysisVersion>4.5.0-1.22517.9</MicrosoftCodeAnalysisVersion>
diff --git a/src/tools/illink/eng/common/native/init-compiler.sh b/src/tools/illink/eng/common/native/init-compiler.sh
index 292ebb6535868d..c670cb79689218 100644
--- a/src/tools/illink/eng/common/native/init-compiler.sh
+++ b/src/tools/illink/eng/common/native/init-compiler.sh
@@ -1,30 +1,25 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
 #
 # NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
 
-if [[ "$#" -lt 3 ]]; then
+if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
   echo "Usage..."
-  echo "init-compiler.sh <script directory> <Architecture> <compiler>"
-  echo "Specify the script directory."
+  echo "build_arch=<ARCH> compiler=<NAME> init-compiler.sh"
   echo "Specify the target architecture."
   echo "Specify the name of compiler (clang or gcc)."
   exit 1
 fi
 
-nativescriptroot="$1"
-build_arch="$2"
-compiler="$3"
-
 case "$compiler" in
     clang*|-clang*|--clang*)
         # clangx.y or clang-x.y
         version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
-        parts=(${version//./ })
-        majorVersion="${parts[0]}"
-        minorVersion="${parts[1]}"
-        if [[ -z "$minorVersion" && "$majorVersion" -le 6 ]]; then
+        majorVersion="${version%%.*}"
+        [ -z "${version##*.*}" ] && minorVersion="${version#*.}"
+
+        if [ -z "$minorVersion" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -le 6 ]; then
             minorVersion=0;
         fi
         compiler=clang
@@ -33,23 +28,20 @@ case "$compiler" in
     gcc*|-gcc*|--gcc*)
         # gccx.y or gcc-x.y
         version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
-        parts=(${version//./ })
-        majorVersion="${parts[0]}"
-        minorVersion="${parts[1]}"
+        majorVersion="${version%%.*}"
+        [ -z "${version##*.*}" ] && minorVersion="${version#*.}"
         compiler=gcc
         ;;
 esac
 
 cxxCompiler="$compiler++"
 
-. "$nativescriptroot"/../pipeline-logging-functions.sh
-
 # clear the existing CC and CXX from environment
 CC=
 CXX=
 LDFLAGS=
 
-if [[ "$compiler" == "gcc" ]]; then cxxCompiler="g++"; fi
+if [ "$compiler" = "gcc" ]; then cxxCompiler="g++"; fi
 
 check_version_exists() {
     desired_version=-1
@@ -66,40 +58,41 @@ check_version_exists() {
     echo "$desired_version"
 }
 
-if [[ -z "$CLR_CC" ]]; then
+if [ -z "$CLR_CC" ]; then
 
     # Set default versions
-    if [[ -z "$majorVersion" ]]; then
+    if [ -z "$majorVersion" ]; then
         # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
-        elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
-
-        for version in "${versions[@]}"; do
-            parts=(${version//./ })
-            desired_version="$(check_version_exists "${parts[0]}" "${parts[1]}")"
-            if [[ "$desired_version" != "-1" ]]; then majorVersion="${parts[0]}"; break; fi
+        if [ "$compiler" = "clang" ]; then versions="15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
+        elif [ "$compiler" = "gcc" ]; then versions="12 11 10 9 8 7 6 5 4.9"; fi
+
+        for version in $versions; do
+            _major="${version%%.*}"
+            [ -z "${version##*.*}" ] && _minor="${version#*.}"
+            desired_version="$(check_version_exists "$_major" "$_minor")"
+            if [ "$desired_version" != "-1" ]; then majorVersion="$_major"; break; fi
         done
 
-        if [[ -z "$majorVersion" ]]; then
+        if [ -z "$majorVersion" ]; then
             if command -v "$compiler" > /dev/null; then
-                if [[ "$(uname)" != "Darwin" ]]; then
-                    Write-PipelineTelemetryError -category "Build" -type "warning" "Specific version of $compiler not found, falling back to use the one in PATH."
+                if [ "$(uname)" != "Darwin" ]; then
+                    echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
                 fi
                 CC="$(command -v "$compiler")"
                 CXX="$(command -v "$cxxCompiler")"
             else
-                Write-PipelineTelemetryError -category "Build" "No usable version of $compiler found."
+                echo "No usable version of $compiler found."
                 exit 1
             fi
         else
-            if [[ "$compiler" == "clang" && "$majorVersion" -lt 5 ]]; then
-                if [[ "$build_arch" == "arm" || "$build_arch" == "armel" ]]; then
+            if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
+                if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
                     if command -v "$compiler" > /dev/null; then
-                        Write-PipelineTelemetryError -category "Build" -type "warning" "Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
+                        echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
                         CC="$(command -v "$compiler")"
                         CXX="$(command -v "$cxxCompiler")"
                     else
-                        Write-PipelineTelemetryError -category "Build" "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
+                        echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
                         exit 1
                     fi
                 fi
@@ -107,33 +100,33 @@ if [[ -z "$CLR_CC" ]]; then
         fi
     else
         desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
-        if [[ "$desired_version" == "-1" ]]; then
-            Write-PipelineTelemetryError -category "Build" "Could not find specific version of $compiler: $majorVersion $minorVersion."
+        if [ "$desired_version" = "-1" ]; then
+            echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
             exit 1
         fi
     fi
 
-    if [[ -z "$CC" ]]; then
+    if [ -z "$CC" ]; then
         CC="$(command -v "$compiler$desired_version")"
         CXX="$(command -v "$cxxCompiler$desired_version")"
-        if [[ -z "$CXX" ]]; then CXX="$(command -v "$cxxCompiler")"; fi
+        if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
     fi
 else
-    if [[ ! -f "$CLR_CC" ]]; then
-        Write-PipelineTelemetryError -category "Build" "CLR_CC is set but path '$CLR_CC' does not exist"
+    if [ ! -f "$CLR_CC" ]; then
+        echo "CLR_CC is set but path '$CLR_CC' does not exist"
         exit 1
     fi
     CC="$CLR_CC"
     CXX="$CLR_CXX"
 fi
 
-if [[ -z "$CC" ]]; then
-    Write-PipelineTelemetryError -category "Build" "Unable to find $compiler."
+if [ -z "$CC" ]; then
+    echo "Unable to find $compiler."
     exit 1
 fi
 
 # Only lld version >= 9 can be considered stable. lld doesn't support s390x.
-if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 && "$build_arch" != "s390x" ]]; then
+if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then
     if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
         LDFLAGS="-fuse-ld=lld"
     fi
diff --git a/src/tools/illink/eng/common/templates/job/onelocbuild.yml b/src/tools/illink/eng/common/templates/job/onelocbuild.yml
index c2cabcf9e06860..60ab00c4de3acd 100644
--- a/src/tools/illink/eng/common/templates/job/onelocbuild.yml
+++ b/src/tools/illink/eng/common/templates/job/onelocbuild.yml
@@ -14,6 +14,7 @@ parameters:
   ReusePr: true
   UseLfLineEndings: true
   UseCheckedInLocProjectJson: false
+  SkipLocProjectJsonGeneration: false
   LanguageSet: VS_Main_Languages
   LclSource: lclFilesInRepo
   LclPackageId: ''
@@ -56,12 +57,13 @@ jobs:
         demands: ImageOverride -equals windows.vs2019.amd64
 
   steps:
-    - task: Powershell@2
-      inputs:
-        filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
-        arguments: $(_GenerateLocProjectArguments)
-      displayName: Generate LocProject.json
-      condition: ${{ parameters.condition }}
+    - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
+      - task: Powershell@2
+        inputs:
+          filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
+          arguments: $(_GenerateLocProjectArguments)
+        displayName: Generate LocProject.json
+        condition: ${{ parameters.condition }}
 
     - task: OneLocBuild@2
       displayName: OneLocBuild
diff --git a/src/tools/illink/eng/common/tools.ps1 b/src/tools/illink/eng/common/tools.ps1
index fc56f63f6f2554..1a8c16c56e566b 100644
--- a/src/tools/illink/eng/common/tools.ps1
+++ b/src/tools/illink/eng/common/tools.ps1
@@ -815,7 +815,8 @@ function MSBuild-Core() {
       Write-Host "See log: $buildLog" -ForegroundColor DarkGray
     }
 
-    if ($ci) {
+    # When running on Azure Pipelines, override the returned exit code to avoid double logging.
+    if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) {
       Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
       # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
       # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
diff --git a/src/tools/illink/eng/common/tools.sh b/src/tools/illink/eng/common/tools.sh
index 975e6be63916ba..2f27d7453cd495 100755
--- a/src/tools/illink/eng/common/tools.sh
+++ b/src/tools/illink/eng/common/tools.sh
@@ -472,7 +472,9 @@ function MSBuild-Core {
       # We should not Write-PipelineTaskError here because that message shows up in the build summary
       # The build already logged an error, that's the reason it failed. Producing an error here only adds noise.
       echo "Build failed with exit code $exit_code. Check errors above."
-      if [[ "$ci" == "true" ]]; then
+
+      # When running on Azure Pipelines, override the returned exit code to avoid double logging.
+      if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then
         Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
         # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
         # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
diff --git a/src/tools/illink/global.json b/src/tools/illink/global.json
index 13d86f9ec8ee1a..9cfa3b1badccf2 100644
--- a/src/tools/illink/global.json
+++ b/src/tools/illink/global.json
@@ -8,7 +8,7 @@
     "dotnet": "7.0.100"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22616.1",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22623.1",
     "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "7.0.0-rtm.22507.1"
   }

From 77f7c1c3e96318104e244cb75b446d524818183c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 13:47:08 +0000
Subject: [PATCH 02/10] Update dependencies from
 https://github.com/dotnet/arcade build 20221230.1 (dotnet/linker#3170)

[main] Update dependencies from dotnet/arcade


Commit migrated from https://github.com/dotnet/linker/commit/c30cfda2cff26b1842335aa18ac401768cf98e61
---
 src/tools/illink/eng/Version.Details.xml | 8 ++++----
 src/tools/illink/eng/Versions.props      | 2 +-
 src/tools/illink/global.json             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/tools/illink/eng/Version.Details.xml b/src/tools/illink/eng/Version.Details.xml
index 58f017af2010e0..fd8cf6a393bdad 100644
--- a/src/tools/illink/eng/Version.Details.xml
+++ b/src/tools/illink/eng/Version.Details.xml
@@ -3,14 +3,14 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22623.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22630.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
+      <Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22623.1">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22630.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
+      <Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-rtm.22507.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/src/tools/illink/eng/Versions.props b/src/tools/illink/eng/Versions.props
index eb5355ce2a812a..7b0aea6ea2dd81 100644
--- a/src/tools/illink/eng/Versions.props
+++ b/src/tools/illink/eng/Versions.props
@@ -18,7 +18,7 @@
     <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
     <MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion>
-    <MicrosoftDotNetApiCompatVersion>8.0.0-beta.22623.1</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetApiCompatVersion>8.0.0-beta.22630.1</MicrosoftDotNetApiCompatVersion>
     <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion>
     <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
     <MicrosoftCodeAnalysisVersion>4.5.0-1.22517.9</MicrosoftCodeAnalysisVersion>
diff --git a/src/tools/illink/global.json b/src/tools/illink/global.json
index 9cfa3b1badccf2..06e0b987ce9c14 100644
--- a/src/tools/illink/global.json
+++ b/src/tools/illink/global.json
@@ -8,7 +8,7 @@
     "dotnet": "7.0.100"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22623.1",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22630.1",
     "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "7.0.0-rtm.22507.1"
   }

From a0508075106cfe0d1d26bf13bfd802ba1ff69bde Mon Sep 17 00:00:00 2001
From: Vitek Karas <10670590+vitek-karas@users.noreply.github.com>
Date: Tue, 3 Jan 2023 03:55:41 -0800
Subject: [PATCH 03/10] Add tests for type deconstruction and construction
 (dotnet/linker#3164)

This was prompted by https://github.com/dotnet/linker/issues/3158
So I just added several tests for various shapes of type deconstructions. To make it symmetric I also added tests for what I call type construction (tuples, anonymous types, records).

Commit migrated from https://github.com/dotnet/linker/commit/72d05e415bbc6801af9b2963d6fd8a8dc261f2ae
---
 .../DataFlowTests.cs                          |   6 +
 .../DataFlow/ConstructedTypesDataFlow.cs      | 194 ++++++++++++++++++
 2 files changed, 200 insertions(+)
 create mode 100644 src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/ConstructedTypesDataFlow.cs

diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs
index e622c02e02eb25..d589a6f3a0457c 100644
--- a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs
+++ b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs
@@ -100,6 +100,12 @@ public Task CompilerGeneratedCodeAccessedViaReflection ()
 			return RunTest ();
 		}
 
+		[Fact]
+		public Task ConstructedTypesDataFlow ()
+		{
+			return RunTest ();
+		}
+
 		[Fact]
 		public Task DynamicDependencyDataflow ()
 		{
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/ConstructedTypesDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/ConstructedTypesDataFlow.cs
new file mode 100644
index 00000000000000..ee085aafaee926
--- /dev/null
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/ConstructedTypesDataFlow.cs
@@ -0,0 +1,194 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Mono.Linker.Tests.Cases.Expectations.Assertions;
+using Mono.Linker.Tests.Cases.Expectations.Helpers;
+
+namespace Mono.Linker.Tests.Cases.DataFlow
+{
+	[ExpectedNoWarnings]
+	[SkipKeptItemsValidation]
+	class ConstructedTypesDataFlow
+	{
+		public static void Main ()
+		{
+			DeconstructedVariable.Test ();
+			ConstructedVariable.Test ();
+		}
+
+		class DeconstructedVariable
+		{
+			// https://github.com/dotnet/linker/issues/3158
+			[ExpectedWarning ("IL2077", ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
+			static void DeconstructVariableNoAnnotation ((Type type, object instance) input)
+			{
+				var (type, instance) = input;
+				type.RequiresPublicMethods ();
+			}
+
+			record TypeAndInstance (
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+				[property: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+				Type type,
+				object instance);
+
+			// In IL based tools this is a behavior of the compiler. The attribute on the record declaration parameter
+			// is only propagated to the .ctor constructor parameter. The property and field attributes are applied to the
+			// generated property and field respectively. But none of the attributes is propagated to the Deconstruct method parameters.
+			// For analyzer, this is currently
+			// https://github.com/dotnet/linker/issues/3158
+			//   But it's possible that with that fixed there won't be a warning from the analyzer anyway (depends on the implementation)
+			[ExpectedWarning ("IL2067", ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
+			static void DeconstructRecordWithAnnotation (TypeAndInstance value)
+			{
+				var (type, instance) = value;
+				type.RequiresPublicMethods ();
+			}
+
+			class TypeAndInstanceManual
+			{
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+				public Type type;
+				public object instance;
+
+				public TypeAndInstanceManual ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type type, object instance)
+					=> (this.type, this.instance) = (type, instance);
+
+				public void Deconstruct ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] out Type type, out object instance)
+					=> (type, instance) = (this.type, this.instance);
+			}
+
+			// This case actually works because the annotation is correctly propagated through the Deconstruct
+			static void DeconstructClassWithAnnotation (TypeAndInstanceManual value)
+			{
+				var (type, instance) = value;
+				type.RequiresPublicMethods ();
+			}
+
+			record TypeAndInstanceRecordManual (
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+				[property: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
+				Type type,
+				object instance)
+			{
+				// The generated property getter doesn't have the same attributes???
+				// The attributes are only propagated to the generated .ctor - so suppressing the warning the this.type doesn't have the matching annotations
+				//[UnconditionalSuppressMessage ("", "IL2072")]
+				public void Deconstruct ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] out Type type, out object instance)
+					=> (type, instance) = (this.type, this.instance);
+			}
+
+			static void DeconstructRecordManualWithAnnotation (TypeAndInstanceRecordManual value)
+			{
+				var (type, instance) = value;
+				type.RequiresPublicMethods ();
+			}
+
+			// https://github.com/dotnet/linker/issues/3158
+			[ExpectedWarning ("IL2067", ProducedBy = ProducedBy.Trimmer | ProducedBy.NativeAot)]
+			static void DeconstructRecordManualWithMismatchAnnotation (TypeAndInstanceRecordManual value)
+			{
+				var (type, instance) = value;
+				type.RequiresPublicFields ();
+			}
+
+			public static void Test ()
+			{
+				DeconstructVariableNoAnnotation ((typeof (string), null));
+				DeconstructRecordWithAnnotation (new (typeof (string), null));
+				DeconstructClassWithAnnotation (new (typeof (string), null));
+				DeconstructRecordManualWithAnnotation (new (typeof (string), null));
+				DeconstructRecordManualWithMismatchAnnotation (new (typeof (string), null));
+			}
+		}
+
+		class ConstructedVariable
+		{
+			[ExpectedWarning ("IL2077")]
+			static void ConstructedType ()
+			{
+				var ct = (typeof (string), 1);
+				ct.Item1.RequiresPublicMethods ();
+			}
+
+			[ExpectedWarning ("IL2077")]
+			static void ConstructedTypeNamed ()
+			{
+				(Type Type, int Value) ct = (typeof (string), 1);
+				ct.Type.RequiresPublicMethods ();
+			}
+
+			[ExpectedWarning ("IL2077")]
+			static void ConstructedTypeWithAnnotations ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type type)
+			{
+				var ct = (type, 1);
+				ct.Item1.RequiresPublicMethods ();
+			}
+
+			[ExpectedWarning ("IL2072")]
+			static void AnonymousTypeWithoutAnnotations ()
+			{
+				var ct = new {
+					Type = typeof (string),
+					Value = 1
+				};
+
+				ct.Type.RequiresPublicMethods ();
+			}
+
+			[ExpectedWarning ("IL2072")]
+			static void AnonymousTypeWithExplicitTypesWithoutAnnotations ()
+			{
+				var ct = new {
+					Type = typeof (string),
+					Value = 1
+				};
+
+				ct.Type.RequiresPublicMethods ();
+			}
+
+			// Compiler doesn't propagate attributes, only types
+			[ExpectedWarning ("IL2072")]
+			static void AnonymousTypeWithAnnotation ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type type)
+			{
+				var ct = new {
+					Type = type,
+					Value = 1
+				};
+
+				ct.Type.RequiresPublicMethods ();
+			}
+
+			record TypeAndValue ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type Type, int Value);
+
+			[ExpectedWarning ("IL2067", "typeUnknown")]
+			static void RecordConstruction (
+				[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type typeWithPublicMethods,
+				Type typeUnknown)
+			{
+				_ = new TypeAndValue (typeof (string), 1);
+				_ = new TypeAndValue (typeWithPublicMethods, 2);
+				_ = new TypeAndValue (typeUnknown, 3);
+			}
+
+			public static void Test ()
+			{
+				ConstructedType ();
+				ConstructedTypeNamed ();
+				ConstructedTypeWithAnnotations (typeof (string));
+
+				AnonymousTypeWithoutAnnotations ();
+				AnonymousTypeWithExplicitTypesWithoutAnnotations ();
+				AnonymousTypeWithAnnotation (typeof (string));
+
+				RecordConstruction (typeof (string), typeof (string));
+			}
+		}
+	}
+}

From 6e3afcc92901dd08e418df25362c7e75ff00b733 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Wed, 4 Jan 2023 00:36:46 -0800
Subject: [PATCH 04/10] Update cecil (dotnet/linker#3171)

Commit migrated from https://github.com/dotnet/linker/commit/19c7f532b783f31566dcf12e00f85baa5372b0ed
---
 src/tools/illink/external/Mono.Cecil.overrides | 8 ++++----
 src/tools/illink/external/cecil                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tools/illink/external/Mono.Cecil.overrides b/src/tools/illink/external/Mono.Cecil.overrides
index 5c41e8cfa80cb6..e2502fc4fc715b 100644
--- a/src/tools/illink/external/Mono.Cecil.overrides
+++ b/src/tools/illink/external/Mono.Cecil.overrides
@@ -1,9 +1,5 @@
 <Project>
 
-  <!-- Cecil's Directory.Build.Props imports this file if it
-       exists. We use it to import our own Directory.Build.props. -->
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
   <PropertyGroup>
     <!-- Cecil sets PublicSign on windows, but we always want to
          PublicSign. -->
@@ -13,6 +9,10 @@
          will depend on the publicly available package. Note that we can't set
          just set Version here because Arcade will override it. -->
     <PackageVersion>$(MonoCecilVersion)</PackageVersion>
+    <!-- When building cecil as a submodule, use the Mono.Cecil.* package IDs
+         instead of the Microsoft.DotNet.Cecil.*, so that the ILLink reference package
+         depends on the publicly available package. -->
+    <PackageId>$(MSBuildProjectName)</PackageId>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MonoBuild)' == ''">
diff --git a/src/tools/illink/external/cecil b/src/tools/illink/external/cecil
index 1840b7410d37a6..61a57d143fc06e 160000
--- a/src/tools/illink/external/cecil
+++ b/src/tools/illink/external/cecil
@@ -1 +1 @@
-Subproject commit 1840b7410d37a613e684b6f9650e39e2d4950bbb
+Subproject commit 61a57d143fc06e69123307e2d5fb2bb9ab1230ef

From 6a76ba0fb8f54b71faa07e571f665928e09bf749 Mon Sep 17 00:00:00 2001
From: Vitek Karas <10670590+vitek-karas@users.noreply.github.com>
Date: Thu, 5 Jan 2023 00:44:23 -0800
Subject: [PATCH 05/10] Add tests for ldtoken analysis and fixes a small bug
 for a field (dotnet/linker#3173)

LdToken acts basically as a reflection access and so it needs to warn about the returned member if that has annotations on it.

Commit migrated from https://github.com/dotnet/linker/commit/beb6d3b60770d2b5c86488b25e1c9426b5d6d4c5
---
 .../src/linker/Linker.Steps/MarkStep.cs       |  1 +
 .../AnnotatedMembersAccessedViaReflection.cs  | 85 ++++++++++++++-----
 2 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs b/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs
index 1c5f10340ae4e1..ad20063a06a7c2 100644
--- a/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs
+++ b/src/tools/illink/src/linker/Linker.Steps/MarkStep.cs
@@ -1793,6 +1793,7 @@ void ProcessAnalysisAnnotationsForField (FieldDefinition field, DependencyKind d
 			case DependencyKind.DynamicDependency:
 			case DependencyKind.DynamicallyAccessedMember:
 			case DependencyKind.InteropMethodDependency:
+			case DependencyKind.Ldtoken:
 				if (isReflectionAccessCoveredByDAM = Annotations.FlowAnnotations.ShouldWarnWhenAccessedForReflection (field))
 					Context.LogWarning (origin, DiagnosticId.DynamicallyAccessedMembersFieldAccessedViaReflection, field.GetDisplayName ());
 
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/AnnotatedMembersAccessedViaReflection.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/AnnotatedMembersAccessedViaReflection.cs
index 288c59c27e1361..1a00f9325cf3bc 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/AnnotatedMembersAccessedViaReflection.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/AnnotatedMembersAccessedViaReflection.cs
@@ -32,7 +32,6 @@ public static void Main ()
 			AnnotatedGenerics.Test ();
 			AnnotationOnGenerics.Test ();
 			AnnotationOnInteropMethod.Test ();
-			AccessThroughLdToken.Test ();
 		}
 
 		class AnnotatedField
@@ -128,6 +127,17 @@ static void DynamicallyAccessedMembersNestedTypes2 ()
 				typeof (AnnotatedField).RequiresNonPublicNestedTypes ();
 			}
 
+			static void PotentialWriteAccess (ref Type type)
+			{
+			}
+
+			// https://github.com/dotnet/linker/issues/3172
+			[ExpectedWarning ("IL2110", nameof (AnnotatedField._annotatedField), ProducedBy = ProducedBy.Trimmer)]
+			static void LdToken ()
+			{
+				Expression<Action> a = () => PotentialWriteAccess (ref _annotatedField);
+			}
+
 			[UnconditionalSuppressMessage ("test", "IL2026")]
 			public static void Test ()
 			{
@@ -143,6 +153,7 @@ public static void Test ()
 				DynamicallyAccessedMembersAll2 ();
 				DynamicallyAccessedMembersNestedTypes1 ();
 				DynamicallyAccessedMembersNestedTypes2 ();
+				LdToken ();
 			}
 		}
 
@@ -251,6 +262,14 @@ static void DynamicallyAccessedMembersAll2 ()
 				typeof (AnnotatedMethodParameters).RequiresAll ();
 			}
 
+			// https://github.com/dotnet/linker/issues/3172
+			[ExpectedWarning ("IL2111", nameof (MethodWithSingleAnnotatedParameter), ProducedBy = ProducedBy.Trimmer)]
+			[ExpectedWarning ("IL2067", nameof (MethodWithSingleAnnotatedParameter), ProducedBy = ProducedBy.Analyzer)]
+			static void LdToken ()
+			{
+				Expression<Action<Type>> _ = (Type t) => MethodWithSingleAnnotatedParameter (t);
+			}
+
 			[UnconditionalSuppressMessage ("test", "IL2026")]
 			public static void Test ()
 			{
@@ -265,6 +284,7 @@ public static void Test ()
 				Ldvirtftn ();
 				DynamicallyAccessedMembersAll1 ();
 				DynamicallyAccessedMembersAll2 ();
+				LdToken ();
 			}
 		}
 
@@ -363,6 +383,18 @@ static void LdftnOnVirtual ()
 				var _ = new Func<Type> ((new AnnotatedMethodReturnValue ()).VirtualMethodWithAnnotatedReturnValue);
 			}
 
+			static void LdTokenOnStatic ()
+			{
+				Expression<Action> _ = () => StaticMethodWithAnnotatedReturnValue ();
+			}
+
+			// https://github.com/dotnet/linker/issues/3172
+			[ExpectedWarning ("IL2111", nameof (VirtualMethodWithAnnotatedReturnValue), ProducedBy = ProducedBy.Trimmer)]
+			static void LdTokenOnVirtual ()
+			{
+				Expression<Action<AnnotatedMethodReturnValue>> _ = (a) => a.VirtualMethodWithAnnotatedReturnValue ();
+			}
+
 			[UnconditionalSuppressMessage ("test", "IL2026")]
 			public static void Test ()
 			{
@@ -380,6 +412,8 @@ public static void Test ()
 				LdftnOnStatic ();
 				LdftnOnInstance ();
 				LdftnOnVirtual ();
+				LdTokenOnStatic ();
+				LdTokenOnVirtual ();
 			}
 		}
 
@@ -563,6 +597,13 @@ static void DynamicallyAccessedFields ()
 				typeof (AnnotatedProperty).RequiresNonPublicFields ();
 			}
 
+			// Action delegate is not handled correctly https://github.com/dotnet/linker/issues/2561
+			[ExpectedWarning ("IL2111", nameof (Property1WithAnnotation), ProducedBy = ProducedBy.Trimmer)]
+			static void LdToken ()
+			{
+				Expression<Func<Type>> _ = () => Property1WithAnnotation;
+			}
+
 			[UnconditionalSuppressMessage ("test", "IL2026")]
 			public static void Test ()
 			{
@@ -581,6 +622,7 @@ public static void Test ()
 				DynamicallyAccessedMembersAll1 ();
 				DynamicallyAccessedMembersAll2 ();
 				DynamicallyAccessedFields ();
+				LdToken ();
 			}
 		}
 
@@ -623,6 +665,12 @@ static void DynamicallyAccessedMembersAll ()
 				typeof (AnnotatedGenerics).RequiresAll ();
 			}
 
+			[ExpectedWarning ("IL2091", nameof (GenericWithAnnotation))]
+			static void LdToken<TUnknown> ()
+			{
+				Expression<Action> _ = () => GenericWithAnnotation<TUnknown> ();
+			}
+
 			public static void Test ()
 			{
 				ReflectionOnly ();
@@ -630,6 +678,7 @@ public static void Test ()
 				DynamicallyAccessedMembers ();
 				InstantiateGeneric ();
 				DynamicallyAccessedMembersAll ();
+				LdToken<string> ();
 			}
 		}
 
@@ -693,6 +742,17 @@ static void DynamicallyAccessedMembersAll2 ()
 				typeof (AnnotationOnGenerics).RequiresAll ();
 			}
 
+			// https://github.com/dotnet/linker/issues/3172
+			[ExpectedWarning ("IL2111", "GenericWithAnnotatedMethod", "AnnotatedMethod", ProducedBy = ProducedBy.Trimmer)]
+			static void LdToken ()
+			{
+				// Note that this should warn even though the code looks "Correct"
+				// That is because under the hood the expression tree create MethodInfo which is accessible by anything
+				// which gets the expression tree as input (so some queryable) and that could invoke the method
+				// with a different parameter value and thus violate the requirements.
+				Expression<Action> _ = () => GenericWithAnnotatedMethod<TestType>.AnnotatedMethod (typeof (TestType));
+			}
+
 			public static void Test ()
 			{
 				GenericTypeWithStaticMethodViaLdftn ();
@@ -702,6 +762,7 @@ public static void Test ()
 				GenericMethodDynamicallyAccessedMembers ();
 				DynamicallyAccessedMembersAll1 ();
 				DynamicallyAccessedMembersAll2 ();
+				LdToken ();
 			}
 		}
 
@@ -713,12 +774,12 @@ struct ValueWithAnnotatedField
 				public Type _typeField;
 			}
 
-			// Analyzer doesnt take into account interop attributes https://github.com/dotnet/linker/issues/2562
+			// Analyzer doesn't take into account interop attributes https://github.com/dotnet/linker/issues/2562
 			[ExpectedWarning ("IL2110", nameof (ValueWithAnnotatedField._typeField), ProducedBy = ProducedBy.Trimmer)]
 			[DllImport ("nonexistent")]
 			static extern ValueWithAnnotatedField GetValueWithAnnotatedField ();
 
-			// Analyzer doesnt take into account interop attributes https://github.com/dotnet/linker/issues/2562
+			// Analyzer doesn't take into account interop attributes https://github.com/dotnet/linker/issues/2562
 			[ExpectedWarning ("IL2110", nameof (ValueWithAnnotatedField._typeField), ProducedBy = ProducedBy.Trimmer)]
 			[DllImport ("nonexistent")]
 			static extern void AcceptValueWithAnnotatedField (ValueWithAnnotatedField value);
@@ -730,24 +791,6 @@ public static void Test ()
 			}
 		}
 
-		class AccessThroughLdToken
-		{
-			public virtual Type PropertyWithLdToken {
-				[return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
-				get {
-					return null;
-				}
-			}
-
-			// Action delegate is not handled correctly https://github.com/dotnet/linker/issues/2561
-			[ExpectedWarning ("IL2111", nameof (PropertyWithLdToken), ProducedBy = ProducedBy.Trimmer)]
-			[ExpectedWarning ("IL2111", nameof (PropertyWithLdToken), ProducedBy = ProducedBy.Trimmer)]
-			public static void Test ()
-			{
-				Expression<Func<Type>> getter = () => (new AccessThroughLdToken ()).PropertyWithLdToken;
-			}
-		}
-
 		public class AnnotatedAttributeConstructorAttribute : Attribute
 		{
 			public AnnotatedAttributeConstructorAttribute ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.All)] Type type)

From ea56a4689825a46e6933e1175474bcd1a9ba4161 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Thu, 5 Jan 2023 11:05:12 +0100
Subject: [PATCH 06/10] Revert "Update cecil" (dotnet/linker#3174)

This reverts commit dotnet/linker@19c7f532b783f31566dcf12e00f85baa5372b0ed.

Commit migrated from https://github.com/dotnet/linker/commit/4b3f78cbc7284b4198652a695e9fe0267133728e
---
 src/tools/illink/external/Mono.Cecil.overrides | 8 ++++----
 src/tools/illink/external/cecil                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tools/illink/external/Mono.Cecil.overrides b/src/tools/illink/external/Mono.Cecil.overrides
index e2502fc4fc715b..5c41e8cfa80cb6 100644
--- a/src/tools/illink/external/Mono.Cecil.overrides
+++ b/src/tools/illink/external/Mono.Cecil.overrides
@@ -1,5 +1,9 @@
 <Project>
 
+  <!-- Cecil's Directory.Build.Props imports this file if it
+       exists. We use it to import our own Directory.Build.props. -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
   <PropertyGroup>
     <!-- Cecil sets PublicSign on windows, but we always want to
          PublicSign. -->
@@ -9,10 +13,6 @@
          will depend on the publicly available package. Note that we can't set
          just set Version here because Arcade will override it. -->
     <PackageVersion>$(MonoCecilVersion)</PackageVersion>
-    <!-- When building cecil as a submodule, use the Mono.Cecil.* package IDs
-         instead of the Microsoft.DotNet.Cecil.*, so that the ILLink reference package
-         depends on the publicly available package. -->
-    <PackageId>$(MSBuildProjectName)</PackageId>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MonoBuild)' == ''">
diff --git a/src/tools/illink/external/cecil b/src/tools/illink/external/cecil
index 61a57d143fc06e..1840b7410d37a6 160000
--- a/src/tools/illink/external/cecil
+++ b/src/tools/illink/external/cecil
@@ -1 +1 @@
-Subproject commit 61a57d143fc06e69123307e2d5fb2bb9ab1230ef
+Subproject commit 1840b7410d37a613e684b6f9650e39e2d4950bbb

From 9ec7fc1ed545a531f462cd45be55c5d1adb413eb Mon Sep 17 00:00:00 2001
From: Vitek Karas <10670590+vitek-karas@users.noreply.github.com>
Date: Mon, 9 Jan 2023 05:36:53 -0800
Subject: [PATCH 07/10] Fix new warning which shows up with latest roslyn
 (dotnet/linker#3179)

First encountered in https://github.com/dotnet/runtime/pull/80235, so copying the change to dotnet/linker

Commit migrated from https://github.com/dotnet/linker/commit/12885df2741bae9cc8451b15c4b4547decd7249a
---
 .../src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs     | 6 +++---
 .../illink/src/linker/Linker/LinkerAttributesInformation.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tools/illink/src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs b/src/tools/illink/src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs
index 5685f3cfd713e9..43ad68864dfac1 100644
--- a/src/tools/illink/src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs
+++ b/src/tools/illink/src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs
@@ -68,7 +68,7 @@ readonly struct FeatureSwitchMembers
 			public string FeatureValue { get; }
 			public string FeatureDefault { get; }
 			// Unique value to track the key
-			private readonly String _key;
+			private readonly string _key;
 
 			public FeatureSwitchMembers (string feature, string featureValue, string featureDefault)
 			{
@@ -302,7 +302,7 @@ void OutputXml (string iLLinkTrimXmlFilePath, string outputFileName)
 		{
 			XmlDocument doc = new XmlDocument ();
 			doc.Load (iLLinkTrimXmlFilePath);
-			XmlNode linkerNode = doc["linker"];
+			XmlElement linkerNode = doc["linker"];
 
 			if (featureSwitchMembers.Count > 0) {
 				foreach ((var fs, var members) in featureSwitchMembers.Select (kv => (kv.Key, kv.Value))) {
@@ -344,7 +344,7 @@ void OutputXml (string iLLinkTrimXmlFilePath, string outputFileName)
 
 		static void AddXmlTypeNode (XmlDocument doc, XmlNode assemblyNode, string typeName, ClassMembers members)
 		{
-			XmlNode typeNode = doc.CreateElement ("type");
+			XmlElement typeNode = doc.CreateElement ("type");
 			XmlAttribute typeFullName = doc.CreateAttribute ("fullname");
 			typeFullName.Value = typeName;
 			typeNode.Attributes.Append (typeFullName);
diff --git a/src/tools/illink/src/linker/Linker/LinkerAttributesInformation.cs b/src/tools/illink/src/linker/Linker/LinkerAttributesInformation.cs
index 9fef9b59cdeb81..3daeb136f11df6 100644
--- a/src/tools/illink/src/linker/Linker/LinkerAttributesInformation.cs
+++ b/src/tools/illink/src/linker/Linker/LinkerAttributesInformation.cs
@@ -106,7 +106,7 @@ public IEnumerable<T> GetAttributes<T> () where T : Attribute
 			return attributeList.Cast<T> ();
 		}
 
-		static Attribute? ProcessRequiresUnreferencedCodeAttribute (LinkContext context, ICustomAttributeProvider provider, CustomAttribute customAttribute)
+		static RequiresUnreferencedCodeAttribute? ProcessRequiresUnreferencedCodeAttribute (LinkContext context, ICustomAttributeProvider provider, CustomAttribute customAttribute)
 		{
 			if (!(provider is MethodDefinition || provider is TypeDefinition))
 				return null;

From 0ce2ec35d7af99248a779e78cde94962db87f8b5 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Tue, 10 Jan 2023 13:13:16 -0800
Subject: [PATCH 08/10] Update cecil (dotnet/linker#3180)

To pick up RVA field fix

Commit migrated from https://github.com/dotnet/linker/commit/7716bee375b3c3bd0ec0e55258ab0f3178c45a4f
---
 src/tools/illink/external/Mono.Cecil.overrides | 8 ++++----
 src/tools/illink/external/cecil                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tools/illink/external/Mono.Cecil.overrides b/src/tools/illink/external/Mono.Cecil.overrides
index 5c41e8cfa80cb6..a59872db41abb9 100644
--- a/src/tools/illink/external/Mono.Cecil.overrides
+++ b/src/tools/illink/external/Mono.Cecil.overrides
@@ -1,9 +1,5 @@
 <Project>
 
-  <!-- Cecil's Directory.Build.Props imports this file if it
-       exists. We use it to import our own Directory.Build.props. -->
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
   <PropertyGroup>
     <!-- Cecil sets PublicSign on windows, but we always want to
          PublicSign. -->
@@ -27,6 +23,10 @@
     <PublicKey>00240000048000009400000006020000002400005253413100040000010001002b5c9f7f04346c324a3176f8d3ee823bbf2d60efdbc35f86fd9e65ea3e6cd11bcdcba3a353e55133c8ac5c4caaba581b2c6dfff2cc2d0edc43959ddb86b973300a479a82419ef489c3225f1fe429a708507bd515835160e10bc743d20ca33ab9570cfd68d479fcf0bc797a763bec5d1000f0159ef619e709d915975e87beebaf</PublicKey>
     <PublicKeyToken>50cebf1cceb9d05e</PublicKeyToken>
     <NoWarn>$(NoWarn);0618</NoWarn>
+    <!-- When building cecil as a submodule, use the Mono.Cecil.* package IDs
+         instead of the Microsoft.DotNet.Cecil.*, so that the ILLink reference package
+         depends on the publicly available package. -->
+    <PackageId>$(MSBuildProjectName)</PackageId>
   </PropertyGroup>
 
 </Project>
diff --git a/src/tools/illink/external/cecil b/src/tools/illink/external/cecil
index 1840b7410d37a6..2941911af1e028 160000
--- a/src/tools/illink/external/cecil
+++ b/src/tools/illink/external/cecil
@@ -1 +1 @@
-Subproject commit 1840b7410d37a613e684b6f9650e39e2d4950bbb
+Subproject commit 2941911af1e028ec4b508cbb8c326003089bc610

From 3e58c1d1aa4969ecb29569119e430d76b315106c Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Thu, 12 Jan 2023 00:11:43 -0800
Subject: [PATCH 09/10] Unpin Microsoft.CodeAnalysis.NetAnalyzers version
 (dotnet/linker#3182)

Commit migrated from https://github.com/dotnet/linker/commit/10bb5ae1476941dbdfe3afa327db01750232db8a
---
 src/tools/illink/eng/Analyzers.props | 1 -
 src/tools/illink/eng/Versions.props  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/tools/illink/eng/Analyzers.props b/src/tools/illink/eng/Analyzers.props
index facf033c323dbc..37816d62cac78f 100644
--- a/src/tools/illink/eng/Analyzers.props
+++ b/src/tools/illink/eng/Analyzers.props
@@ -2,7 +2,6 @@
   <ItemGroup Condition="'$(RunAnalyzers)' == 'true'">
     <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisCSharpCodeStyleVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" PrivateAssets="all" />
     <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="all" /> -->
   </ItemGroup>
 
diff --git a/src/tools/illink/eng/Versions.props b/src/tools/illink/eng/Versions.props
index 7b0aea6ea2dd81..21861f23f41790 100644
--- a/src/tools/illink/eng/Versions.props
+++ b/src/tools/illink/eng/Versions.props
@@ -25,7 +25,6 @@
     <MicrosoftNetCompilersToolsetVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftNetCompilersToolsetVersion>
     <MicrosoftCodeAnalysisCSharpAnalyzerTestingXunitVersion>1.0.1-beta1.*</MicrosoftCodeAnalysisCSharpAnalyzerTestingXunitVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22513.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftILVerificationVersion>7.0.0-preview.7.22375.6</MicrosoftILVerificationVersion>
     <!-- This controls the version of the cecil package, or the version of cecil in the project graph
          when we build the cecil submodule. The reference assembly package will depend on this version of cecil.

From 93174f3d17e3f40a68f847750f3c864d88f6d0ab Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Sat, 14 Jan 2023 00:51:00 -0800
Subject: [PATCH 10/10] Fix race condition in build (dotnet/linker#3185)

Commit migrated from https://github.com/dotnet/linker/commit/44520382eda0c82c5a4d3f38d3f59965f3ba90b0
---
 src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj
index bce6899a86c0c3..bd69b155788b08 100644
--- a/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj
+++ b/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj
@@ -52,10 +52,7 @@
   <ItemGroup>
     <ProjectReference Include="../linker/Mono.Linker.csproj" PrivateAssets="All" Condition=" '$(TargetFramework)' == '$(NetCoreAppToolCurrent)' " />
     <PackageReference Condition="'$(UseCecilPackage)' == 'true'" Include="Mono.Cecil" Version="$(MonoCecilVersion)" PrivateAssets="All" Publish="True" />
-    <ProjectReference Condition="'$(UseCecilPackage)' != 'true'" Include="../../external/cecil/Mono.Cecil.csproj" PrivateAssets="All">
-      <!-- https://github.com/dotnet/sdk/issues/2280#issuecomment-392815466 -->
-      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
-    </ProjectReference>
+    <ProjectReference Condition="'$(UseCecilPackage)' != 'true'" Include="../../external/cecil/Mono.Cecil.csproj" PrivateAssets="All" />
     <ProjectReference Condition="('$(UseCecilPackage)' != 'true') And ('$(TargetFramework)' != 'net472')" Include="../../external/cecil/symbols/pdb/Mono.Cecil.Pdb.csproj" PrivateAssets="All" />
   </ItemGroup>