Skip to content

[main] Update dependencies from 7 repositories #52440

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

Merged
merged 26 commits into from
May 13, 2021
Merged

[main] Update dependencies from 7 repositories #52440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
11aee7a
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] May 7, 2021
d1a515d
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 7, 2021
d433dd9
Update dependencies from https://github.com/dotnet/llvm-project build…
dotnet-maestro[bot] May 7, 2021
a85c7f0
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] May 8, 2021
250240f
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 8, 2021
a3c1362
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] May 8, 2021
4df2582
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] May 10, 2021
ae5922a
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] May 11, 2021
2e0d28b
Merge branch 'main' into darc-main-3c52fbd5-2ada-4054-95f7-8a74ad2300c5
safern May 12, 2021
3baa942
Update dependencies from https://github.com/dotnet/icu build 20210510.1
dotnet-maestro[bot] May 12, 2021
544c226
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 12, 2021
3f34f72
Update dependencies from https://github.com/dotnet/llvm-project build…
dotnet-maestro[bot] May 12, 2021
4e2e780
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] May 12, 2021
be3fbb0
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] May 12, 2021
e232ec8
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] May 12, 2021
7f9f733
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 12, 2021
e21fa53
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] May 12, 2021
7757658
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 12, 2021
cd3f817
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] May 12, 2021
48b39c0
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 12, 2021
66f8bcb
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] May 12, 2021
ba2364c
Merge remote-tracking branch 'dotnet/main' into darc-main-3c52fbd5-2a…
safern May 12, 2021
085d593
Fix attribute diffs
safern May 12, 2021
b3d01fe
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] May 13, 2021
3119e0c
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 13, 2021
5db82ab
Fix package testing on net46*
ericstj May 13, 2021
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
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.21255.1",
"version": "1.0.0-prerelease.21263.1",
"commands": [
"xharness"
]
Expand Down
180 changes: 90 additions & 90 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,28 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21256.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21256.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21256.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21256.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21256.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21256.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21256.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21256.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21256.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21256.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21256.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21256.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageValidationVersion>6.0.0-beta.21256.1</MicrosoftDotNetPackageValidationVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21263.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21263.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21263.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21263.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21263.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21263.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21263.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21263.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21263.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageValidationVersion>6.0.0-beta.21260.1</MicrosoftDotNetPackageValidationVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.5.21253.1</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.5.21253.1</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.5.21260.1</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.5.21260.1</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.5.21253.1</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.5.21260.1</MicrosoftNETCoreILAsmVersion>
<!-- Libraries dependencies -->
<StyleCopAnalyzersVersion>1.2.0-beta.304</StyleCopAnalyzersVersion>
<SystemAppContextVersion>4.3.0</SystemAppContextVersion>
Expand Down Expand Up @@ -102,24 +102,24 @@
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion>
<SystemTextJsonVersion>6.0.0-preview.5.21253.1</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.5.21253.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemTextJsonVersion>6.0.0-preview.5.21260.1</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.5.21260.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingVersion>4.3.0</SystemThreadingVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-preview.5.21253.1</runtimenativeSystemIOPortsVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-preview.5.21260.1</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21230.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.21230.1</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>6.0.0-beta.21230.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>6.0.0-beta.21230.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>6.0.0-beta.21230.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.21230.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.21230.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21230.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21230.1</SystemWindowsExtensionsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21260.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.21260.1</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>6.0.0-beta.21260.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>6.0.0-beta.21260.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>6.0.0-beta.21260.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.21260.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.21260.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21260.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21260.1</SystemWindowsExtensionsTestDataVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21255.6</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21255.6</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand Down Expand Up @@ -148,9 +148,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21255.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21255.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21257.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21263.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21263.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21261.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
Expand All @@ -163,16 +163,16 @@
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>6.0.100-preview.5.21257.1</MicrosoftNETILLinkTasksVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21253.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.5.21260.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21253.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21253.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21253.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21253.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21253.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21253.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21253.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21253.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21260.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21260.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21260.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21260.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21260.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21260.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21260.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21260.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Override isolated build dependency versions with versions from Repo API. -->
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
Expand Down
13 changes: 11 additions & 2 deletions eng/common/post-build/symbols-validation.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 "... "

Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 2 additions & 0 deletions src/libraries/Microsoft.VisualBasic.Core/ref/Microsoft.VisualBasic.Core.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Copy link
Member

@safern safern May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: @MaximLipnin this was missed on your PR. Let me know if it makes sense.

Copy link
Contributor

@MaximLipnin MaximLipnin May 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if it's related to Lock/Unlock methods which cause PNSE on iOS/tvOS and were annotated in my PR, but it seems that it makes sense to annotate this particular method as well, thank you.

[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; }
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NoCom.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/pkg/test/frameworkSettings/net/settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@

<!-- windows.winmd is not part of the framework -->
<IgnoredReference Include="Windows" />

<!-- this assembly is part of the netstandard support libs and has built in conflicts and dangling references -->
<ExcludeFromClosure Include="netfx.force.conflicts" />
</ItemGroup>

<!-- this target must run before ResolveLockFileReferences so
Expand Down