Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into nativeaot-mobile
Browse files Browse the repository at this point in the history
# Conflicts:
#	eng/Subsets.props
  • Loading branch information
akoeplinger committed Feb 14, 2023
2 parents 2cbba74 + 8a96ee7 commit f0f3390
Show file tree
Hide file tree
Showing 110 changed files with 1,761 additions and 932 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.23108.1",
"version": "1.0.0-prerelease.23110.1",
"commands": [
"xharness"
]
Expand Down
5 changes: 1 addition & 4 deletions eng/Subsets.props
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@
<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="$(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+'))">true</UseNativeAotCoreLib>

<!-- If we're using only the NativeAOT CoreLib then also default testing to NativeAOT -->
<TestNativeAot Condition="'$(UseNativeAotCoreLib)' == 'true'">true</TestNativeAot>
<UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')))">true</UseNativeAotCoreLib>
</PropertyGroup>

<ItemGroup>
Expand Down
164 changes: 84 additions & 80 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,121 +92,125 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23109.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="14.0.0-alpha.1.23110.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -248,45 +252,45 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>7ae7fa6c7b66b1b683c9e772d588c652682756fe</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.2.23105.4">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.2.23112.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>58719ec90b3bbae527dd81685bf8670b993fe8f9</Sha>
<Sha>252018c3d3fffdb592413cf61d5b80cf751e0a59</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="8.0.0-preview.2.23105.4">
<Dependency Name="runtime.native.System.IO.Ports" Version="8.0.0-preview.2.23112.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>58719ec90b3bbae527dd81685bf8670b993fe8f9</Sha>
<Sha>252018c3d3fffdb592413cf61d5b80cf751e0a59</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.0-preview.2.23105.4">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.0-preview.2.23112.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>58719ec90b3bbae527dd81685bf8670b993fe8f9</Sha>
<Sha>252018c3d3fffdb592413cf61d5b80cf751e0a59</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.0-preview.2.23105.4">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.0-preview.2.23112.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>58719ec90b3bbae527dd81685bf8670b993fe8f9</Sha>
<Sha>252018c3d3fffdb592413cf61d5b80cf751e0a59</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.0-preview.2.23105.4">
<Dependency Name="System.Text.Json" Version="8.0.0-preview.2.23112.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>58719ec90b3bbae527dd81685bf8670b993fe8f9</Sha>
<Sha>252018c3d3fffdb592413cf61d5b80cf751e0a59</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23105.4">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23112.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>58719ec90b3bbae527dd81685bf8670b993fe8f9</Sha>
<Sha>252018c3d3fffdb592413cf61d5b80cf751e0a59</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.23108.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.23110.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>bde66a8c7071bc96175bfb5eb619394fff03902e</Sha>
<Sha>6e20fd14ba45ff67193f961186d373ffbcfd5ea2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23108.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23110.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>bde66a8c7071bc96175bfb5eb619394fff03902e</Sha>
<Sha>6e20fd14ba45ff67193f961186d373ffbcfd5ea2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.23108.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.23110.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>bde66a8c7071bc96175bfb5eb619394fff03902e</Sha>
<Sha>6e20fd14ba45ff67193f961186d373ffbcfd5ea2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23109.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b888df17a4acb65630c1e9ad5e94f22a33b62ab0</Sha>
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23068.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand All @@ -308,9 +312,9 @@
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>540aeecc7eb2b3cc22069fdf072de08296041ba3</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.23107.1">
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.23110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>4e0ae43f9b7b55ba3bd3ed5cf590da3f15b83f48</Sha>
<Sha>758d8a04223a3238863dd28bce0ec2e20b3bb960</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-1.23073.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
Loading

0 comments on commit f0f3390

Please sign in to comment.