diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 14ccd5e0cfd80..a5c11de1747f7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21324.2", + "version": "1.0.0-prerelease.21328.4", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8b08594ccc97..cfe0a882b2deb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 59588c1257a842089d0b7df3bad1cdd69ac720e1 + e7626ad8c04b150de635f920b5e8dede0aafaf73 https://github.com/dotnet/msquic @@ -10,69 +10,69 @@ - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 https://github.com/microsoft/vstest @@ -114,37 +114,37 @@ https://github.com/dotnet/runtime-assets 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + 51c322893cff67a67e503d00e9c328d9d40b6a06 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + 51c322893cff67a67e503d00e9c328d9d40b6a06 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + 51c322893cff67a67e503d00e9c328d9d40b6a06 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + 51c322893cff67a67e503d00e9c328d9d40b6a06 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + 51c322893cff67a67e503d00e9c328d9d40b6a06 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + 51c322893cff67a67e503d00e9c328d9d40b6a06 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + 51c322893cff67a67e503d00e9c328d9d40b6a06 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + 51c322893cff67a67e503d00e9c328d9d40b6a06 https://github.com/dotnet/runtime @@ -178,45 +178,45 @@ https://github.com/dotnet/runtime f891033db5b8ebf651176a3dcc3bec74a217f85e - + https://github.com/mono/linker - c739a81ba553b00df1cb2f5b9974deae996b757a + f574448d16af45f7ac2c4b89d71dea73dec86726 - + https://github.com/dotnet/xharness - 49b0eedd8ecb0dea7e00c89097a5cd0f1f584257 + 2890d740e1dd9fc41a634777c4af59a3986b1f7b - + https://github.com/dotnet/xharness - 49b0eedd8ecb0dea7e00c89097a5cd0f1f584257 + 2890d740e1dd9fc41a634777c4af59a3986b1f7b - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f291c7f87a563f29ff2a9af7378495769d97389c + b89374348ff2344a625677584be9dfc9bea2b971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f291c7f87a563f29ff2a9af7378495769d97389c + b89374348ff2344a625677584be9dfc9bea2b971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f291c7f87a563f29ff2a9af7378495769d97389c + b89374348ff2344a625677584be9dfc9bea2b971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f291c7f87a563f29ff2a9af7378495769d97389c + b89374348ff2344a625677584be9dfc9bea2b971 - + https://github.com/dotnet/emsdk - 617928847d1e11458527b8bbafb5577982291847 + f5349765b7af1970c5b25cce4ed278544907cbe0 - + https://github.com/dotnet/hotreload-utils - 6adb8ac00a59fe409f232b8b32758aa7d10b4d1d + 2b1536142083d6270dc40c5cba74fbb0a612beab https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 38d89aaab8317..d8104e89eb444 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,19 +50,19 @@ 3.10.0 6.0.0-rc1.21324.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 2.5.1-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 - 6.0.0-beta.21321.1 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 2.5.1-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 + 6.0.0-beta.21329.8 5.9.0-preview.2 @@ -122,10 +122,10 @@ 6.0.0-beta.21314.1 6.0.0-beta.21314.1 - 1.0.0-prerelease.21320.4 - 1.0.0-prerelease.21320.4 - 1.0.0-prerelease.21320.4 - 1.0.0-prerelease.21320.4 + 1.0.0-prerelease.21329.4 + 1.0.0-prerelease.21329.4 + 1.0.0-prerelease.21329.4 + 1.0.0-prerelease.21329.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -149,9 +149,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21324.2 - 1.0.0-prerelease.21324.2 - 1.0.1-alpha.0.21314.1 + 1.0.0-prerelease.21328.4 + 1.0.0-prerelease.21328.4 + 1.0.1-alpha.0.21328.1 2.4.1 2.4.2 1.3.0 @@ -162,23 +162,23 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21317.4 + 6.0.100-preview.6.21330.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-preview.7.21315.3 + 6.0.0-preview.7.21328.1 6.0.0-preview.7.21328.2 - 11.1.0-alpha.1.21314.1 - 11.1.0-alpha.1.21314.1 - 11.1.0-alpha.1.21314.1 - 11.1.0-alpha.1.21314.1 - 11.1.0-alpha.1.21314.1 - 11.1.0-alpha.1.21314.1 - 11.1.0-alpha.1.21314.1 - 11.1.0-alpha.1.21314.1 + 11.1.0-alpha.1.21328.1 + 11.1.0-alpha.1.21328.1 + 11.1.0-alpha.1.21328.1 + 11.1.0-alpha.1.21328.1 + 11.1.0-alpha.1.21328.1 + 11.1.0-alpha.1.21328.1 + 11.1.0-alpha.1.21328.1 + 11.1.0-alpha.1.21328.1 - 6.0.0-preview.7.21323.1 + 6.0.0-preview.7.21330.1 $(MicrosoftNETRuntimeEmscripten2023Nodewinx64Version) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5619c7aaee1d7..4b25520324931 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" + + $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } + if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { + $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" + } else { + $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe" + } + + return $global:_MSBuildExe } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 83d95eae00859..517ebf719850c 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -13,6 +13,8 @@ true true + + false false diff --git a/global.json b/global.json index 433797e811628..77fd48d8d2a18 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21321.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21329.8", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21321.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21321.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21329.8", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21329.8", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21329.8", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21321.2" diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs index 845c5391eb22d..a0faa6ad6e02a 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs @@ -104,6 +104,7 @@ public override FileStream[] GetFiles(bool getResourceModules) public override string Location => throw new NotSupportedException(SR.NotSupported_DynamicAssembly); + [RequiresAssemblyFiles(Message = "The code will throw for assemblies embedded in a single-file app")] public override string? CodeBase => throw new NotSupportedException(SR.NotSupported_DynamicAssembly); [RequiresUnreferencedCode("Types might be removed")] diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs index 89fb20181a83e..dc866cf6ba374 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs +++ b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs @@ -83,6 +83,7 @@ private static extern bool GetCodeBase(QCallAssembly assembly, return null; } + [RequiresAssemblyFiles(Message = "The code will throw for assemblies embedded in a single-file app")] public override string? CodeBase { get diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs index 70133628f1917..5dbdeeb3a67b0 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs @@ -8,6 +8,7 @@ namespace System.Reflection.Emit { public sealed partial class AssemblyBuilder : Assembly { + [RequiresAssemblyFiles(Message = "The code will throw for assemblies embedded in a single-file app")] public override string? CodeBase => throw new NotSupportedException(SR.NotSupported_DynamicAssembly); public override string Location => throw new NotSupportedException(SR.NotSupported_DynamicAssembly); public override MethodInfo? EntryPoint => null; diff --git a/src/libraries/System.Reflection.Context/src/System/Reflection/Context/Delegation/DelegatingAssembly.cs b/src/libraries/System.Reflection.Context/src/System/Reflection/Context/Delegation/DelegatingAssembly.cs index cbbeda045ab17..7b86c7f71e9d9 100644 --- a/src/libraries/System.Reflection.Context/src/System/Reflection/Context/Delegation/DelegatingAssembly.cs +++ b/src/libraries/System.Reflection.Context/src/System/Reflection/Context/Delegation/DelegatingAssembly.cs @@ -22,11 +22,13 @@ public DelegatingAssembly(Assembly assembly) UnderlyingAssembly = assembly; } +#pragma warning disable IL3003 // netstandard2.1 didn't have RequiresAssemblyFiles attributes applied on Assembly [RequiresAssemblyFiles(Message = "Calling 'System.Reflection.Assembly.Location' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'", Url = "https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/il3000")] public override string Location { get { return UnderlyingAssembly.Location; } } +#pragma warning restore IL3003 public override Module ManifestModule { @@ -108,6 +110,7 @@ public override Type[] GetExportedTypes() return UnderlyingAssembly.GetExportedTypes(); } +#pragma warning disable IL3003 // netstandard2.1 didn't have RequiresAssemblyFiles attributes applied on Assembly [RequiresAssemblyFiles(Message = "Calling 'System.Reflection.Assembly.GetFile(string)' will throw for assemblies embedded in a single-file app", Url = "https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/il3001")] public override FileStream GetFile(string name) { @@ -125,6 +128,7 @@ public override FileStream[] GetFiles(bool getResourceModules) { return UnderlyingAssembly.GetFiles(getResourceModules); } +#pragma warning restore IL3003 public override Module[] GetLoadedModules(bool getResourceModules) { diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/Assemblies/RoAssembly.cs b/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/Assemblies/RoAssembly.cs index 22b3a00939027..949994d04b3a9 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/Assemblies/RoAssembly.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/Assemblies/RoAssembly.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; using System.Runtime.Serialization; @@ -43,10 +44,12 @@ protected RoAssembly(MetadataLoadContext loader, int assemblyFileCount) public abstract override string Location { get; } #if NET5_0_OR_GREATER [Obsolete(Obsoletions.CodeBaseMessage, DiagnosticId = Obsoletions.CodeBaseDiagId, UrlFormat = Obsoletions.SharedUrlFormat)] + [RequiresAssemblyFiles(Message = "The code will throw for assemblies embedded in a single-file app")] #endif public sealed override string CodeBase => throw new NotSupportedException(SR.NotSupported_AssemblyCodeBase); #if NET5_0_OR_GREATER [Obsolete(Obsoletions.CodeBaseMessage, DiagnosticId = Obsoletions.CodeBaseDiagId, UrlFormat = Obsoletions.SharedUrlFormat)] + [RequiresAssemblyFiles(Message = "The code will throw for assemblies embedded in a single-file app")] #endif public sealed override string EscapedCodeBase => throw new NotSupportedException(SR.NotSupported_AssemblyCodeBase); diff --git a/src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs b/src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs index 693f6c9e44757..5fb9e07417464 100644 --- a/src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs +++ b/src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs @@ -74,6 +74,7 @@ public extern override MethodInfo? EntryPoint public override bool ReflectionOnly => false; + [RequiresAssemblyFiles(Message = "The code will throw for assemblies embedded in a single-file app")] public override string? CodeBase { get @@ -252,7 +253,9 @@ private static void AddPublicNestedTypes(Type type, List types, List