Skip to content

[main] Source code updates from dotnet/dotnet #14660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotnet-maestro wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[main] Source code updates from dotnet/dotnet #14660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9db1e6b
Backflow from https://github.com/dotnet/dotnet / ae899ea build 319323
dotnet-maestro[bot] Jun 19, 2026
ae6d669
Update dependencies from build 319323
dotnet-maestro[bot] Jun 19, 2026
83b2c3c
Update dependencies from build 319491
dotnet-maestro[bot] Jun 20, 2026
b06ed19
Update dependencies from build 319511
dotnet-maestro[bot] Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,4 @@
<TestRunnerName>XUnitV3</TestRunnerName>
</PropertyGroup>

<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
<PropertyGroup>
<DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
</PropertyGroup>

</Project>
5 changes: 0 additions & 5 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
<_Parameter1>windows6.1</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

<!-- to prevent using MS.NC.Platforms from SDK, which is lagging behind the version that WinForms gets from the CoreFx packages -->
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms" PrivateAssets="all" />
</ItemGroup>

<!-- Set code coverage properties that reference properties not available in Directory.Build.props -->
<PropertyGroup Condition="'$(Coverage)' == 'true'">
Expand Down
1 change: 0 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<ItemGroup>

<!-- Runtime dependencies-->
<PackageVersion Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" PrivateAssets="all" />
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
Expand Down
52 changes: 25 additions & 27 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,31 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.6.26317.104</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26317.104</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26317.104</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.6.26317.104</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.6.26317.104</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.6.26317.104</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.6.26317.104</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.6.26317.104</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.6.26317.104</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.6.26317.104</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.6.26317.104</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.6.26317.104</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.6.26317.104</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.6.26317.104</SystemWindowsExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>11.0.0-preview.6.26319.105</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26319.105</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26319.105</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>11.0.0-preview.6.26319.105</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>11.0.0-preview.6.26319.105</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26319.105</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>11.0.0-preview.6.26319.105</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-preview.6.26319.105</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-preview.6.26319.105</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>11.0.0-preview.6.26319.105</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-preview.6.26319.105</SystemFormatsNrbfPackageVersion>
<SystemIOHashingPackageVersion>11.0.0-preview.6.26319.105</SystemIOHashingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-preview.6.26319.105</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-preview.6.26319.105</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-preview.6.26319.105</SystemRuntimeSerializationFormattersPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.6.26319.105</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.6.26319.105</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-preview.6.26319.105</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand All @@ -47,7 +46,6 @@ This file should be imported by eng/Versions.props
<MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreILAsmVersion>$(MicrosoftNETCoreILAsmPackageVersion)</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>$(MicrosoftNETCoreILDAsmPackageVersion)</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCorePlatformsVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETCorePlatformsVersion>
<MicrosoftWin32SystemEventsVersion>$(MicrosoftWin32SystemEventsPackageVersion)</MicrosoftWin32SystemEventsVersion>
<runtimewinx64MicrosoftNETCoreILAsmVersion>$(runtimewinx64MicrosoftNETCoreILAsmPackageVersion)</runtimewinx64MicrosoftNETCoreILAsmVersion>
<runtimewinx86MicrosoftNETCoreILAsmVersion>$(runtimewinx86MicrosoftNETCoreILAsmPackageVersion)</runtimewinx86MicrosoftNETCoreILAsmVersion>
Expand Down
106 changes: 51 additions & 55 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,114 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="a065c06c0c5f5647d8e312fc70dec3f5ca77b830" BarId="319156" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="b756a8d8a0e64905e16c81911bb09a8110bc3395" BarId="319511" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="11.0.0-preview.6.26317.104">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="11.0.0-preview.6.26317.104">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26317.104">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26317.104">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-preview.6.26317.104">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Text.Json" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-preview.6.26317.104">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-preview.6.26317.104">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.CodeDom" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-preview.6.26317.104">
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="11.0.0-preview.6.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26317.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26317.104">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26317.104">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26317.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26317.104">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26317.104">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26317.104">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
26 changes: 26 additions & 0 deletions eng/common/native/NativeAotSupported.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Project>
<PropertyGroup>

<!-- Reject unsupported OS via RID prefix match -->
<_NativeAotSupportedOS Condition="
'$(TargetOS)' != 'browser' and
'$(TargetOS)' != 'haiku' and
'$(TargetOS)' != 'illumos' and
'$(TargetOS)' != 'netbsd' and
'$(TargetOS)' != 'solaris'
">true</_NativeAotSupportedOS>

<!-- Reject unsupported architectures via RID suffix match -->
<_NativeAotSupportedArch Condition="
'$(TargetArchitecture)' != 'wasm' and
('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows')
">true</_NativeAotSupportedArch>

<NativeAotSupported Condition="
'$(NativeAotSupported)' == '' and
'$(_NativeAotSupportedOS)' == 'true' and
'$(_NativeAotSupportedArch)' == 'true'
">true</NativeAotSupported>

</PropertyGroup>
</Project>
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26317.104",
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26317.104",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26317.104",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26319.105",
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26319.105",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26319.105",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "11.0.0-preview.6.26317.104"
"Microsoft.NET.Sdk.IL": "11.0.0-preview.6.26319.105"
},
"native-tools": {
"cmake": "latest"
Expand Down