Merge remote-tracking branch 'dotnet/main' into cns_vec-fold

dotnet · Feb 19, 2023 · c20af64 · c20af64
2 parents 2171541 + 5ac3de1
commit c20af64
Show file tree

Hide file tree

Showing 395 changed files with 8,059 additions and 2,345 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -46,6 +46,7 @@
 /src/mono/mono/mini/*type-check* @lambdageek
 /src/mono/mono/mini/debugger-agent.c @vargaz @thaystg @lambdageek
 /src/mono/mono/mini/interp/* @BrzVlad @vargaz @kotlarmilos
+/src/mono/mono/mini/interp/*jiterp* @kg
 
 /src/mono/mono/profiler @BrzVlad @lambdageek
 /src/mono/mono/sgen @BrzVlad @lambdageek @naricc
@@ -62,7 +63,7 @@
 /src/native/public/mono @marek-safar @lambdageek
 
 /src/libraries/sendtohelix-wasm.targets @radical
-/src/mono/wasm @lewing @pavelsavara
+/src/mono/wasm @lewing @pavelsavara @kg
 /src/mono/wasm/debugger @thaystg @radical
 /src/mono/wasm/build @radical
 /src/mono/sample/wasm @lewing @pavelsavara

diff --git a/.github/fabricbot.json b/.github/fabricbot.json
@@ -14847,6 +14847,17 @@
                     }
                   }
                 ]
+              },
+              {
+                "operator": "not",
+                "operands": [
+                  {
+                    "name": "hasLabel",
+                    "parameters": {
+                      "label": "needs-area-label"
+                    }
+                  }
+                ]
               }
             ]
           },
@@ -14913,6 +14924,12 @@
                         "parameters": {
                           "label": "area-Meta"
                         }
+                      },
+                      {
+                        "name": "hasLabel",
+                        "parameters": {
+                          "label": "needs-area-label"
+                        }
                       }
                     ]
                   },
@@ -14946,6 +14963,12 @@
                     "parameters": {
                       "label": "area-Meta"
                     }
+                  },
+                  {
+                    "name": "labelAdded",
+                    "parameters": {
+                      "label": "needs-area-label"
+                    }
                   }
                 ]
               }
@@ -15024,6 +15047,12 @@
                 "parameters": {
                   "label": "area-Meta"
                 }
+              },
+              {
+                "name": "hasLabel",
+                "parameters": {
+                  "label": "needs-area-label"
+                }
               }
             ]
           },
@@ -15522,6 +15551,17 @@
                         }
                       }
                     ]
+                  },
+                  {
+                    "operator": "not",
+                    "operands": [
+                      {
+                        "name": "hasLabel",
+                        "parameters": {
+                          "label": "needs-area-label"
+                        }
+                      }
+                    ]
                   }
                 ]
               }
@@ -15570,6 +15610,12 @@
                 "parameters": {
                   "label": "area-Meta"
                 }
+              },
+              {
+                "name": "hasLabel",
+                "parameters": {
+                  "label": "needs-area-label"
+                }
               }
             ]
           },
@@ -15707,6 +15753,12 @@
                 "parameters": {
                   "label": "area-Meta"
                 }
+              },
+              {
+                "name": "hasLabel",
+                "parameters": {
+                  "label": "needs-area-label"
+                }
               }
             ]
           },
@@ -15805,6 +15857,12 @@
                 "parameters": {
                   "label": "area-Meta"
                 }
+              },
+              {
+                "name": "hasLabel",
+                "parameters": {
+                  "label": "needs-area-label"
+                }
               }
             ]
           },
@@ -15917,6 +15975,12 @@
                 "parameters": {
                   "label": "area-Meta"
                 }
+              },
+              {
+                "name": "hasLabel",
+                "parameters": {
+                  "label": "needs-area-label"
+                }
               }
             ]
           },
@@ -17224,4 +17288,4 @@
       }
     }
   }
-]
+]
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -47,16 +47,22 @@
   </PropertyGroup>
 
   <PropertyGroup Label="SetOSTargetMinVersions">
-    <!-- Minimum Apple target OS versions, keep in sync with src/native/libs/build-native.sh -->
+    <!--
+      Minimum target OS versions, keep in sync with:
+        - eng/native/configurecompiler.cmake
+        - eng/native/build-commons.sh
+        - src/native/libs/build-native.sh
+        - src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ObjectWriter.cs
+        - src/installer/pkg/sfx/bundle/shared-framework-distribution-template-x64.xml
+        - src/installer/pkg/sfx/bundle/shared-framework-distribution-template-arm64.xml
+     -->
+    <AndroidApiLevelMin>21</AndroidApiLevelMin>
     <iOSVersionMin>11.0</iOSVersionMin>
     <tvOSVersionMin>11.0</tvOSVersionMin>
     <watchOSVersionMin>2.0</watchOSVersionMin>
     <watchOS64_32VersionMin>5.1</watchOS64_32VersionMin>
     <macOSVersionMin>10.15</macOSVersionMin>
     <macOSVersionMin Condition="('$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst') and '$(TargetArchitecture)' == 'arm64'">11.0</macOSVersionMin>
-
-    <!-- Minimum version of the Android API level we target, keep in sync with eng/native/build-commons.sh -->
-    <AndroidApiLevelMin>21</AndroidApiLevelMin>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -109,6 +115,19 @@
     <TargetFrameworkForNETCoreTasks>$(NetCoreAppToolCurrent)</TargetFrameworkForNETCoreTasks>
   </PropertyGroup>
 
+  <PropertyGroup Label="CalculateConfiguration">
+    <!-- The RuntimeConfiguration property allows to pass in/specify a configuration that applies to both CoreCLR and Mono. -->
+    <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">$(Configuration)</RuntimeConfiguration>
+    <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == '' and ('$(Configuration)' == 'Debug' or '$(Configuration)' == 'Release')">$(Configuration)</RuntimeConfiguration>
+    <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">Debug</RuntimeConfiguration>
+    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(RuntimeConfiguration)</CoreCLRConfiguration>
+    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' != 'checked'">$(RuntimeConfiguration)</MonoConfiguration>
+    <!-- There's no checked configuration on Mono. -->
+    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' == 'checked'">Debug</MonoConfiguration>
+    <LibrariesConfiguration Condition="'$(LibrariesConfiguration)' == ''">$(Configuration)</LibrariesConfiguration>
+    <HostConfiguration Condition="'$(HostConfiguration)' == ''">$(Configuration)</HostConfiguration>
+  </PropertyGroup>
+
   <PropertyGroup>
     <LibrariesProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'libraries'))</LibrariesProjectRoot>
     <CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'coreclr'))</CoreClrProjectRoot>
@@ -152,19 +171,6 @@
     <WasmtimeDir>$([MSBuild]::NormalizeDirectory($(ArtifactsObjDir), 'wasmtime'))</WasmtimeDir>
   </PropertyGroup>
 
-  <PropertyGroup Label="CalculateConfiguration">
-    <!-- The RuntimeConfiguration property allows to pass in/specify a configuration that applies to both CoreCLR and Mono. -->
-    <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">$(Configuration)</RuntimeConfiguration>
-    <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == '' and ('$(Configuration)' == 'Debug' or '$(Configuration)' == 'Release')">$(Configuration)</RuntimeConfiguration>
-    <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">Debug</RuntimeConfiguration>
-    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(RuntimeConfiguration)</CoreCLRConfiguration>
-    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' != 'checked'">$(RuntimeConfiguration)</MonoConfiguration>
-    <!-- There's no checked configuration on Mono. -->
-    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' == 'checked'">Debug</MonoConfiguration>
-    <LibrariesConfiguration Condition="'$(LibrariesConfiguration)' == ''">$(Configuration)</LibrariesConfiguration>
-    <HostConfiguration Condition="'$(HostConfiguration)' == ''">$(Configuration)</HostConfiguration>
-  </PropertyGroup>
-
   <PropertyGroup Label="CalculateOS">
     <!-- Default to portable build if not explicitly set -->
     <PortableBuild Condition="'$(PortableBuild)' == '' and '$(DotNetBuildFromSource)' == 'true'">false</PortableBuild>

diff --git a/THIRD-PARTY-NOTICES.TXT b/THIRD-PARTY-NOTICES.TXT
@@ -669,7 +669,7 @@ worldwide. This software is distributed without any warranty.
 
 See <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-License for fastmod (https://github.com/lemire/fastmod) and ibm-fpgen (https://github.com/nigeltao/parse-number-fxx-test-data)
+License for fastmod (https://github.com/lemire/fastmod), ibm-fpgen (https://github.com/nigeltao/parse-number-fxx-test-data) and fastrange (https://github.com/lemire/fastrange)
 --------------------------------------
 
    Copyright 2018 Daniel Lemire

diff --git a/docs/area-owners.json b/docs/area-owners.json
@@ -78,6 +78,29 @@
       "label": "os-wasi"
     }
   ],
+  "trimming": [
+    {
+      "lead": "",
+      "owners": [
+        "eerhardt",
+        "vitek-karas",
+        "LakshanF",
+        "sbomer",
+        "joperezr",
+        "marek-safar"
+      ],
+      "label": "linkable-framework"
+    },
+    {
+      "lead": "",
+      "owners": [
+        "eerhardt",
+        "SamMonoRT",
+        "marek-safar"
+      ],
+      "label": "size-reduction"
+    }
+  ],
   "areas": [
     {
       "lead": "agocke",

diff --git a/docs/workflow/testing/libraries/testing-android.md b/docs/workflow/testing/libraries/testing-android.md
@@ -47,8 +47,8 @@ unzip ~/andk.zip -d $(dirname ${ANDROID_NDK_ROOT}) && rm -rf ~/andk.zip
 export ANDROID_SDK_ROOT=~/android-sdk
 curl https://dl.google.com/android/repository/commandlinetools-${HOST_OS_SHORT}-${SDK_VER}.zip -L --output ~/asdk.zip
 mkdir ${ANDROID_SDK_ROOT} && unzip ~/asdk.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools && rm -rf ~/asdk.zip
-yes | ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses
-${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "platforms;android-${SDK_API_LEVEL}" "build-tools;${SDK_BUILD_TOOLS}"
+yes | ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses
+${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "platform-tools" "platforms;android-${SDK_API_LEVEL}" "build-tools;${SDK_BUILD_TOOLS}"
 ```
 
 ### Using Android Studio

diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -45,7 +45,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <RuntimeFlavor Condition="'$(TargetsMobile)' == 'true'">Mono</RuntimeFlavor>
+    <RuntimeFlavor Condition="'$(TargetsMobile)' == 'true' and !$(_subset.Contains('+clr.nativeaotlibs+'))">Mono</RuntimeFlavor>
+    <RuntimeFlavor Condition="'$(TargetsMobile)' == 'true' and $(_subset.Contains('+clr.nativeaotlibs+'))">CoreCLR</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and ($(_subset.Contains('+mono+')) or $(_subset.Contains('+mono.runtime+'))) and (!$(_subset.Contains('+clr+')) and !$(_subset.Contains('+clr.runtime+')))">Mono</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">$(PrimaryRuntimeFlavor)</RuntimeFlavor>
   </PropertyGroup>
@@ -105,7 +106,7 @@
 
   <PropertyGroup>
     <!-- CLR NativeAot only builds in a subset of the matrix -->
-    <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
+    <NativeAotSupported Condition="('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</NativeAotSupported>
 
     <!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
     <UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>