diff --git a/Directory.Build.props b/Directory.Build.props index c2d9e2ee336..4255504f8d8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -72,9 +72,4 @@ XUnitV3 - - - true - - diff --git a/Directory.Build.targets b/Directory.Build.targets index 9896e75ee47..4bdff2371c4 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -13,11 +13,6 @@ <_Parameter1>windows6.1 - - - - - diff --git a/Directory.Packages.props b/Directory.Packages.props index 4e1d9e2536d..5bf587da830 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c05fa13d95d..c0907189c2e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,32 +6,31 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-beta.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 - 11.0.0-preview.6.26317.104 + 11.0.0-beta.26328.106 + 11.0.0-beta.26328.106 + 11.0.0-beta.26328.106 + 11.0.0-beta.26328.106 + 11.0.0-beta.26328.106 + 11.0.0-beta.26328.106 + 11.0.0-beta.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 @@ -47,7 +46,6 @@ This file should be imported by eng/Versions.props $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreILAsmPackageVersion) $(MicrosoftNETCoreILDAsmPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(runtimewinx64MicrosoftNETCoreILAsmPackageVersion) $(runtimewinx86MicrosoftNETCoreILAsmPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfc24d825d2..c5ae9615bb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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 target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 - - - https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - a065c06c0c5f5647d8e312fc70dec3f5ca77b830 + 4e63ed688b0db806aa962c318a237b22aa069435 diff --git a/eng/common/native/NativeAotSupported.props b/eng/common/native/NativeAotSupported.props new file mode 100644 index 00000000000..559a6663929 --- /dev/null +++ b/eng/common/native/NativeAotSupported.props @@ -0,0 +1,26 @@ + + + + + <_NativeAotSupportedOS Condition=" + '$(TargetOS)' != 'browser' and + '$(TargetOS)' != 'haiku' and + '$(TargetOS)' != 'illumos' and + '$(TargetOS)' != 'netbsd' and + '$(TargetOS)' != 'solaris' + ">true + + + <_NativeAotSupportedArch Condition=" + '$(TargetArchitecture)' != 'wasm' and + ('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows') + ">true + + true + + + diff --git a/global.json b/global.json index 4ed09398520..47e1cc36c99 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-preview.5.26227.104", + "version": "11.0.100-preview.5.26302.115", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "11.0.100-preview.5.26227.104", + "dotnet": "11.0.100-preview.5.26302.115", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -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.26328.106", + "Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26328.106", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26328.106", "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.26328.106" }, "native-tools": { "cmake": "latest"