diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6428121a0fec7..02e0543e98b8e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21322.2", + "version": "1.0.0-prerelease.21314.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8995dca95d92..4177e280edf32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,221 +1,222 @@ - + https://github.com/dotnet/icu - 59588c1257a842089d0b7df3bad1cdd69ac720e1 + d7db669b70f4dd67ec001c192f9809c218cab88b - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 + - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 4a2b475948d498b89fedef7cf890883f49bc1ea3 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 - + https://github.com/dotnet/llvm-project - 4f0293e0a254a2f014643ecbe973b81f26c87fd4 + a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + af5c238556e204583b129cc8f5c7338f84dc2c40 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + af5c238556e204583b129cc8f5c7338f84dc2c40 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + af5c238556e204583b129cc8f5c7338f84dc2c40 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + af5c238556e204583b129cc8f5c7338f84dc2c40 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + af5c238556e204583b129cc8f5c7338f84dc2c40 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + af5c238556e204583b129cc8f5c7338f84dc2c40 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + af5c238556e204583b129cc8f5c7338f84dc2c40 - + https://github.com/mono/linker - c739a81ba553b00df1cb2f5b9974deae996b757a + caeaf2a3fb3f636805fdd4881df4f9a539fff8f6 - + https://github.com/dotnet/xharness - 0bb4a23b1b686e8fefde9d4c860b26a8fafc303e + d6f8a4ad30908fb210390380eae97264e4fbe8ce - + https://github.com/dotnet/xharness - 0bb4a23b1b686e8fefde9d4c860b26a8fafc303e + d6f8a4ad30908fb210390380eae97264e4fbe8ce - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f291c7f87a563f29ff2a9af7378495769d97389c + 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f291c7f87a563f29ff2a9af7378495769d97389c + 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f291c7f87a563f29ff2a9af7378495769d97389c + 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f291c7f87a563f29ff2a9af7378495769d97389c + 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f https://github.com/dotnet/emsdk defa37b05c734e025292c5747664e970cd2ac444 - + https://github.com/dotnet/hotreload-utils - 6adb8ac00a59fe409f232b8b32758aa7d10b4d1d + 25b814e010cd4796cedfbcce72a274c26928f496 - https://github.com/dotnet/runtime-assets + https://github.com/dotnet/runtime-assets 8d7b898b96cbdb868cac343e938173105287ed9e diff --git a/eng/Versions.props b/eng/Versions.props index 3bc9edaa1b14c..b62b9b4854cfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,28 +49,28 @@ 3.10.0-2.final 3.10.0-2.final - 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.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 + 2.5.1-beta.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 + 6.0.0-beta.21311.3 5.9.0-preview.2 6.0.0-alpha.1.20612.4 - 6.0.0-preview.7.21321.2 - 6.0.0-preview.7.21321.2 + 6.0.0-preview.6.21314.1 + 6.0.0-preview.6.21314.1 3.1.0 - 6.0.0-preview.7.21321.2 + 6.0.0-preview.6.21314.1 5.0.0 4.3.0 @@ -104,27 +104,27 @@ 5.0.0 5.0.0 4.8.1 - 6.0.0-preview.7.21321.2 - 6.0.0-preview.7.21321.2 + 6.0.0-preview.6.21314.1 + 6.0.0-preview.6.21314.1 4.5.4 4.5.0 - 6.0.0-preview.7.21321.2 + 6.0.0-preview.6.21314.1 6.0.0-beta.21314.1 6.0.0-beta.21307.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 + 6.0.0-beta.21307.1 + 6.0.0-beta.21307.1 + 6.0.0-beta.21307.1 + 6.0.0-beta.21307.1 + 6.0.0-beta.21307.1 + 6.0.0-beta.21307.1 + 6.0.0-beta.21307.1 + 6.0.0-beta.21307.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.21313.4 + 1.0.0-prerelease.21313.4 + 1.0.0-prerelease.21313.4 + 1.0.0-prerelease.21313.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -148,9 +148,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21322.2 - 1.0.0-prerelease.21322.2 - 1.0.1-alpha.0.21314.1 + 1.0.0-prerelease.21314.1 + 1.0.0-prerelease.21314.1 + 1.0.1-alpha.0.21311.1 2.4.1 2.4.2 1.3.0 @@ -161,19 +161,19 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21317.4 + 6.0.100-preview.6.21310.3 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-preview.7.21315.3 + 6.0.0-preview.6.21307.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.21314.1 + 11.1.0-alpha.1.21308.1 + 11.1.0-alpha.1.21308.1 + 11.1.0-alpha.1.21308.1 + 11.1.0-alpha.1.21308.1 + 11.1.0-alpha.1.21308.1 + 11.1.0-alpha.1.21308.1 + 11.1.0-alpha.1.21308.1 + 11.1.0-alpha.1.21308.1 6.0.0-preview.6.21275.1 $(MicrosoftNETRuntimeEmscripten2021Nodewinx64Version) diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 25e97ac00772d..de348a2e225c0 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -25,15 +25,8 @@ Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to # Template files $jsonFiles = @() -$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern -$jsonTemplateFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json - - $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" - $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru -} - -$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $xlfFiles = @() @@ -51,7 +44,7 @@ $langXlfFiles | ForEach-Object { $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru } -$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles +$locFiles = $jsonFiles + $xlfFiles $locJson = @{ Projects = @( diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b58d42364b9e7..6e8aa9f7f218b 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -7,13 +7,9 @@ parameters: binlogPath: artifacts/log/Debug/Build.binlog pool: vmImage: vs2017-win2016 - condition: '' - dependsOn: '' jobs: - job: SourceIndexStage1 - dependsOn: ${{ parameters.dependsOn }} - condition: ${{ parameters.condition }} variables: - name: SourceIndexPackageVersion value: ${{ parameters.sourceIndexPackageVersion }} diff --git a/global.json b/global.json index 433797e811628..df8f7ead63774 100644 --- a/global.json +++ b/global.json @@ -12,13 +12,13 @@ "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.21311.3", "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.21311.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21311.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21311.3", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21321.2" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21314.1" } } diff --git a/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml index 0504df00e7659..533fc1cd0ed04 100644 --- a/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml @@ -5,7 +5,7 @@ ILLink IL2050 member - M:System.Data.Odbc.OdbcConnectionHandle.SetConnectionAttribute4(System.Data.Odbc.ODBC32.SQL_ATTR,System.Transactions.IDtcTransaction,System.Int32) + M:Interop.Odbc.SQLSetConnectAttrW(System.Data.Odbc.OdbcConnectionHandle,System.Data.Odbc.ODBC32.SQL_ATTR,System.Transactions.IDtcTransaction,System.Int32) ILLink diff --git a/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml index 5386e4bd294fc..2e52a33c8a98e 100644 --- a/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml @@ -5,25 +5,7 @@ ILLink IL2050 member - M:System.Data.OleDb.DBPropSet.SetLastErrorInfo(System.Data.OleDb.OleDbHResult) - - - ILLink - IL2050 - member - M:System.Data.OleDb.OleDbConnection.ProcessResults(System.Data.OleDb.OleDbHResult,System.Data.OleDb.OleDbConnection,System.Object) - - - ILLink - IL2050 - member - M:System.Data.OleDb.OleDbDataAdapter.FillClose(System.Boolean,System.Object) - - - ILLink - IL2050 - member - M:System.Data.OleDb.OleDbDataAdapter.FillFromADODB(System.Object,System.Object,System.String,System.Boolean) + M:System.Data.Common.UnsafeNativeMethods.GetErrorInfo(System.Int32,System.Data.Common.UnsafeNativeMethods.IErrorInfo@) ILLink diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml index 7572cc7074afb..ae9db1185dd9c 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml @@ -5,7 +5,7 @@ ILLink IL2050 member - M:System.DirectoryServices.AccountManagement.UnsafeNativeMethods.ADsOpenObject(System.String,System.String,System.String,System.Int32,System.Guid@,System.Object@) + M:System.DirectoryServices.AccountManagement.UnsafeNativeMethods.IntADsOpenObject(System.String,System.String,System.String,System.Int32,System.Guid@,System.Object@) ILLink diff --git a/src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml index ca9681a8e8f63..0e87e736269c4 100644 --- a/src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml @@ -5,7 +5,7 @@ ILLink IL2050 member - M:System.DirectoryServices.Interop.UnsafeNativeMethods.ADsOpenObject(System.String,System.String,System.String,System.Int32,System.Guid@,System.Object@) + M:System.DirectoryServices.Interop.UnsafeNativeMethods.IntADsOpenObject(System.String,System.String,System.String,System.Int32,System.Guid@,System.Object@) ILLink diff --git a/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml index 3f367cccd2496..d5734aab1a2a9 100644 --- a/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml @@ -5,61 +5,67 @@ ILLink IL2050 member - M:System.Drawing.Bitmap.#ctor(System.IO.Stream,System.Boolean) + M:System.Drawing.Icon.OleCreatePictureIndirect(System.Drawing.Icon.PICTDESC,System.Guid@,System.Boolean) ILLink IL2050 member - M:System.Drawing.Icon.Save(System.IO.Stream) + M:System.Drawing.SafeNativeMethods.Gdip.GdipCreateBitmapFromStream(Interop.Ole32.IStream,System.IntPtr@) ILLink IL2050 member - M:System.Drawing.Image.FromStream(System.IO.Stream,System.Boolean,System.Boolean) + M:System.Drawing.SafeNativeMethods.Gdip.GdipCreateBitmapFromStreamICM(Interop.Ole32.IStream,System.IntPtr@) ILLink IL2050 member - M:System.Drawing.Image.InitializeFromStream(System.IO.Stream) + M:System.Drawing.SafeNativeMethods.Gdip.GdipCreateMetafileFromStream(Interop.Ole32.IStream,System.IntPtr@) ILLink IL2050 member - M:System.Drawing.Image.Save(System.IO.Stream,System.Drawing.Imaging.ImageCodecInfo,System.Drawing.Imaging.EncoderParameters) + M:System.Drawing.SafeNativeMethods.Gdip.GdipGetMetafileHeaderFromStream(Interop.Ole32.IStream,System.IntPtr) ILLink IL2050 member - M:System.Drawing.Imaging.Metafile.#ctor(System.IO.Stream,System.IntPtr,System.Drawing.Imaging.EmfType,System.String) + M:System.Drawing.SafeNativeMethods.Gdip.GdipLoadImageFromStream(Interop.Ole32.IStream,System.IntPtr@) ILLink IL2050 member - M:System.Drawing.Imaging.Metafile.#ctor(System.IO.Stream,System.IntPtr,System.Drawing.Rectangle,System.Drawing.Imaging.MetafileFrameUnit,System.Drawing.Imaging.EmfType,System.String) + M:System.Drawing.SafeNativeMethods.Gdip.GdipLoadImageFromStreamICM(Interop.Ole32.IStream,System.IntPtr@) ILLink IL2050 member - M:System.Drawing.Imaging.Metafile.#ctor(System.IO.Stream,System.IntPtr,System.Drawing.RectangleF,System.Drawing.Imaging.MetafileFrameUnit,System.Drawing.Imaging.EmfType,System.String) + M:System.Drawing.SafeNativeMethods.Gdip.GdipRecordMetafileStream(Interop.Ole32.IStream,System.IntPtr,System.Drawing.Imaging.EmfType,System.Drawing.RectangleF@,System.Drawing.Imaging.MetafileFrameUnit,System.String,System.IntPtr@) ILLink IL2050 member - M:System.Drawing.Imaging.Metafile.#ctor(System.IO.Stream) + M:System.Drawing.SafeNativeMethods.Gdip.GdipRecordMetafileStream(Interop.Ole32.IStream,System.IntPtr,System.Drawing.Imaging.EmfType,System.IntPtr,System.Drawing.Imaging.MetafileFrameUnit,System.String,System.IntPtr@) ILLink IL2050 member - M:System.Drawing.Imaging.Metafile.GetMetafileHeader(System.IO.Stream) + M:System.Drawing.SafeNativeMethods.Gdip.GdipRecordMetafileStreamI(Interop.Ole32.IStream,System.IntPtr,System.Drawing.Imaging.EmfType,System.Drawing.Rectangle@,System.Drawing.Imaging.MetafileFrameUnit,System.String,System.IntPtr@) + + + ILLink + IL2050 + member + M:System.Drawing.SafeNativeMethods.Gdip.GdipSaveImageToStream(System.Runtime.InteropServices.HandleRef,Interop.Ole32.IStream,System.Guid@,System.Runtime.InteropServices.HandleRef) diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index 83ad6233b6432..03492c30ee0f9 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -75,7 +75,7 @@ - +