diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 01eba6aca0188c..fe2b64b88968e8 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21255.1", + "version": "1.0.0-prerelease.21263.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ef01c037bceb6..b9ba9263b5fd58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,194 +1,194 @@ - + https://github.com/dotnet/icu - 2b360359e8a3496d7c80a3bffb6a7b626d51f54c + d85ad26c86ead928c42d09e077090d6578e6d2d9 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/runtime-assets - 15f1cd8ebde52c383c202732777fb20c2e743239 + 6eb103aee0453fa28d8049f59679b41924999e9c - + https://github.com/dotnet/llvm-project - 324e6cfdeead35f665de6e0833b414c56a34a258 + eba3f2dcb38c39d6924f38c168c30336b3e5fc4b - + https://github.com/dotnet/llvm-project - 324e6cfdeead35f665de6e0833b414c56a34a258 + eba3f2dcb38c39d6924f38c168c30336b3e5fc4b - + https://github.com/dotnet/llvm-project - 324e6cfdeead35f665de6e0833b414c56a34a258 + eba3f2dcb38c39d6924f38c168c30336b3e5fc4b - + https://github.com/dotnet/llvm-project - 324e6cfdeead35f665de6e0833b414c56a34a258 + eba3f2dcb38c39d6924f38c168c30336b3e5fc4b - + https://github.com/dotnet/llvm-project - 324e6cfdeead35f665de6e0833b414c56a34a258 + eba3f2dcb38c39d6924f38c168c30336b3e5fc4b - + https://github.com/dotnet/llvm-project - 324e6cfdeead35f665de6e0833b414c56a34a258 + eba3f2dcb38c39d6924f38c168c30336b3e5fc4b - + https://github.com/dotnet/llvm-project - 324e6cfdeead35f665de6e0833b414c56a34a258 + eba3f2dcb38c39d6924f38c168c30336b3e5fc4b - + https://github.com/dotnet/llvm-project - 324e6cfdeead35f665de6e0833b414c56a34a258 + eba3f2dcb38c39d6924f38c168c30336b3e5fc4b https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + e39196ffc9e50f3d8927622daaedcd50681d56f2 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + e39196ffc9e50f3d8927622daaedcd50681d56f2 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + e39196ffc9e50f3d8927622daaedcd50681d56f2 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + e39196ffc9e50f3d8927622daaedcd50681d56f2 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + e39196ffc9e50f3d8927622daaedcd50681d56f2 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + e39196ffc9e50f3d8927622daaedcd50681d56f2 - + https://github.com/dotnet/runtime - e6bb456e608ad24a55f3fef2d1ee4ede07d6c729 + e39196ffc9e50f3d8927622daaedcd50681d56f2 https://github.com/mono/linker 17dd8b63f0f1752685575f920a3c3db00c51ecb9 - + https://github.com/dotnet/xharness - cbd98edd36d8763026152cfee248aeb1537b1d4b + 9596c3fbbb718819bc4bb9a9e3f6271b50fc718a - + https://github.com/dotnet/xharness - cbd98edd36d8763026152cfee248aeb1537b1d4b + 9596c3fbbb718819bc4bb9a9e3f6271b50fc718a - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + 44324e2d3563921f60b1522fccf3fef45dcfe636 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk 1d115709972f58def7b7394fa03f69be78f427a3 - + https://github.com/dotnet/hotreload-utils - 078f7f63b604e97c64cf907e9932a85f8aeb5dc3 + db44d47059b070a687776ff53edbd618593bbe54 diff --git a/eng/Versions.props b/eng/Versions.props index ae34e9f29851a2..ca9ae6bdfbd9a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,28 +51,28 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 2.5.1-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 2.5.1-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21260.1 5.9.0-preview.2 6.0.0-alpha.1.20612.4 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21260.1 + 6.0.0-preview.5.21260.1 3.1.0 - 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21260.1 1.2.0-beta.304 4.3.0 @@ -102,24 +102,24 @@ 4.3.1 4.7.0 4.7.0 - 6.0.0-preview.5.21253.1 - 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21260.1 + 6.0.0-preview.5.21260.1 4.3.0 4.5.4 4.5.0 1.1.1 4.3.0 - 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21260.1 - 6.0.0-beta.21230.1 - 6.0.0-beta.21230.1 - 6.0.0-beta.21230.1 - 6.0.0-beta.21230.1 - 6.0.0-beta.21230.1 - 6.0.0-beta.21230.1 - 6.0.0-beta.21230.1 - 6.0.0-beta.21230.1 - 6.0.0-beta.21230.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 1.0.0-prerelease.21255.6 1.0.0-prerelease.21255.6 @@ -148,9 +148,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21255.1 - 1.0.0-prerelease.21255.1 - 1.0.1-alpha.0.21257.1 + 1.0.0-prerelease.21263.1 + 1.0.0-prerelease.21263.1 + 1.0.1-alpha.0.21261.2 2.4.1 2.4.2 1.3.0 @@ -163,16 +163,16 @@ 6.0.100-preview.5.21257.1 - 6.0.0-preview.5.21253.1 + 6.0.0-preview.5.21260.1 - 9.0.1-alpha.1.21253.1 - 9.0.1-alpha.1.21253.1 - 9.0.1-alpha.1.21253.1 - 9.0.1-alpha.1.21253.1 - 9.0.1-alpha.1.21253.1 - 9.0.1-alpha.1.21253.1 - 9.0.1-alpha.1.21253.1 - 9.0.1-alpha.1.21253.1 + 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21260.1 + 9.0.1-alpha.1.21260.1 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 788321d773d60d..f26f6de81f0f5a 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -114,6 +114,7 @@ $CountMissingSymbols = { $totalRetries = 0 while ($totalRetries -lt $using:MaxRetry) { + # Save the output and get diagnostic output $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String @@ -144,8 +145,16 @@ $CountMissingSymbols = { return $null } - $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath $WindowsPdbVerificationParam - $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath $WindowsPdbVerificationParam + $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault ` + -FullPath $FileName ` + -TargetServerParam '--microsoft-symbol-server' ` + -SymbolsPath $SymbolsPath ` + -WindowsPdbVerificationParam $WindowsPdbVerificationParam + $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault ` + -FullPath $FileName ` + -TargetServerParam '--internal-server' ` + -SymbolsPath $SymbolsPath ` + -WindowsPdbVerificationParam $WindowsPdbVerificationParam Write-Host -NoNewLine "`t Checking file " $FileName "... " diff --git a/global.json b/global.json index 4d4bda58b1e9bb..8fafd33a798f2f 100644 --- a/global.json +++ b/global.json @@ -12,12 +12,12 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21256.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21256.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21256.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21263.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21263.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21263.1", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21253.1" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21260.1" } } diff --git a/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.cs b/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.cs index 4d4641324c6772..0dc88f97333ee4 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.cs @@ -403,7 +403,9 @@ public static void Input(int FileNumber, ref long Value) { } public static void Input(int FileNumber, ref object Value) { } public static void Input(int FileNumber, ref float Value) { } public static void Input(int FileNumber, ref string Value) { } + [System.Runtime.Versioning.UnsupportedOSPlatform("ios")] [System.Runtime.Versioning.UnsupportedOSPlatform("macos")] + [System.Runtime.Versioning.UnsupportedOSPlatform("tvos")] public static string InputString(int FileNumber, int CharCount) { throw null; } public static void Kill(string PathName) { } public static string LineInput(int FileNumber) { throw null; } diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs index 0a1117a7675906..61073d1d6c2a26 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs @@ -23,6 +23,7 @@ public static IntPtr CreateAggregatedObject(IntPtr pOuter, object o) throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop); } + [RequiresUnreferencedCode("Built-in COM support is not trim compatible", Url = "https://aka.ms/dotnet-illink/com")] [SupportedOSPlatform("windows")] public static object BindToMoniker(string monikerName) { diff --git a/src/libraries/pkg/test/frameworkSettings/net/settings.targets b/src/libraries/pkg/test/frameworkSettings/net/settings.targets index e4e8ff23d6855f..30b04a6dee3b01 100644 --- a/src/libraries/pkg/test/frameworkSettings/net/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/net/settings.targets @@ -89,6 +89,9 @@ + + +