From 2c2971cbbd5598eaa531e2eaaf36a8844356d9dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 May 2022 12:21:46 +0000 Subject: [PATCH 01/27] Update dependencies from https://github.com/dotnet/icu build 20220523.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-preview.5.22269.3 -> To Version 7.0.0-preview.5.22273.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2eae8221da917f..0c8ddbcc4f447e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 769d436d511fc775473f2cd9dff15afbe5566010 + b2e3d1dd63d9cd0d7d73182f7304c8387f2eabe9 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 53f4052e9f3189..5923cba2462b6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 7.0.100-1.22270.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.5.22269.3 + 7.0.0-preview.5.22273.1 7.0.0-alpha.1.22273.1 From f0e0a6f40a28930dc3bb27c28bbe8ccc53247175 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 May 2022 12:23:47 +0000 Subject: [PATCH 02/27] Update dependencies from https://github.com/dotnet/xharness build 20220524.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22270.1 -> To Version 1.0.0-prerelease.22274.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 4ecf1c67a9938c..0e48f23cbaa54c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22270.1", + "version": "1.0.0-prerelease.22274.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c8ddbcc4f447e..1cb4a3c20ad357 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -242,17 +242,17 @@ https://github.com/dotnet/linker b0479355a71752de103a2aac89af5cdcdb0455ad - + https://github.com/dotnet/xharness - 9cacd2f874c946a6497110124a2369fb5131c68f + 01cb26a789458315f8ec7366c48b83249e607429 - + https://github.com/dotnet/xharness - 9cacd2f874c946a6497110124a2369fb5131c68f + 01cb26a789458315f8ec7366c48b83249e607429 - + https://github.com/dotnet/xharness - 9cacd2f874c946a6497110124a2369fb5131c68f + 01cb26a789458315f8ec7366c48b83249e607429 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 5923cba2462b6a..74709ae87b476a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ 1.1.0 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22270.1 - 1.0.0-prerelease.22270.1 - 1.0.0-prerelease.22270.1 + 1.0.0-prerelease.22274.1 + 1.0.0-prerelease.22274.1 + 1.0.0-prerelease.22274.1 1.1.0-alpha.0.22259.2 2.4.2-pre.22 0.12.0-pre.20 From 1842e4f0cf7a9af334bd4a14408a4fee614708cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 May 2022 12:25:00 +0000 Subject: [PATCH 03/27] Update dependencies from https://github.com/dotnet/runtime-assets build 20220523.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.22267.1 -> To Version 7.0.0-beta.22273.1 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cb4a3c20ad357..7bdc055de5a7c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -130,53 +130,53 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 https://github.com/dotnet/llvm-project @@ -278,9 +278,9 @@ https://github.com/dotnet/hotreload-utils d9dcc60a194a94a89fa1e31d6b2bf7dec9b1d92f - + https://github.com/dotnet/runtime-assets - bef6668f71c27e2e25d63712cbf02f67ef8c7863 + 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 74709ae87b476a..5d4b4faeffd17b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,19 +117,19 @@ 4.5.0 7.0.0-preview.5.22272.3 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 - 7.0.0-beta.22267.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 + 7.0.0-beta.22273.1 1.0.0-prerelease.22217.3 1.0.0-prerelease.22217.3 From 00a6ce975f7de62bdd7252e8d2a1f2b887448afc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 May 2022 12:46:16 +0000 Subject: [PATCH 04/27] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220524.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.22252.2 -> To Version 7.0.0-preview1.22274.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bdc055de5a7c1..b9b925390237ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -282,9 +282,9 @@ https://github.com/dotnet/runtime-assets 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/roslyn-analyzers - d2ef898a6283858c1224c0114cd87fa27b6cb091 + 04edea1ac503805a8d9a6959ec18e20bff506bb5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5d4b4faeffd17b..4ce8f0c896c24d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ 4.3.0-1.22206.2 4.3.0-1.22206.2 4.3.0-1.22206.2 - 7.0.0-preview1.22252.2 + 7.0.0-preview1.22274.2 4.3.0-1.22206.2 7.0.0-preview.5.22273.1 - 7.0.0-alpha.1.22273.1 + 7.0.0-alpha.1.22273.2 11.1.0-alpha.1.22259.2 11.1.0-alpha.1.22259.2 From 0502c88a204b36c0cfedff2bbe6dca8e8791be43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 May 2022 12:21:30 +0000 Subject: [PATCH 06/27] Update dependencies from https://github.com/dotnet/icu build 20220525.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-preview.5.22269.3 -> To Version 7.0.0-preview.6.22275.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1893f0636d538..54edf84a5a54b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - b2e3d1dd63d9cd0d7d73182f7304c8387f2eabe9 + 69304bb50797c4202ab35af3dd71bce3c9847e4f https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index e0e0151c38938f..d3d12bd6f47b84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 7.0.100-1.22270.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.5.22273.1 + 7.0.0-preview.6.22275.2 7.0.0-alpha.1.22273.2 From dad85c969996b8e94458f1b7402a82e3efa2a876 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 May 2022 12:40:42 +0000 Subject: [PATCH 07/27] Update dependencies from https://github.com/dotnet/emsdk build 20220525.2 Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-preview.5.22268.1 -> To Version 7.0.0-preview.6.22275.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54edf84a5a54b0..2337d189a6d335 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/msquic 3d79a1f817e3cdd8bcd3b5b9986a8bf36fd71e5a - + https://github.com/dotnet/emsdk - dca71051151e0515887671938196f3b87ad1c19f + 494cf3aeba587e09c395969fb61c5bb6dca43cda https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index d3d12bd6f47b84..35014ebfc7b49e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -184,7 +184,7 @@ 11.1.0-alpha.1.22259.2 11.1.0-alpha.1.22259.2 - 7.0.0-preview.5.22268.1 + 7.0.0-preview.6.22275.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda From 5fc3b2d5619a3d406a6e01aafa6fd731d9d4ab87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 May 2022 12:26:42 +0000 Subject: [PATCH 08/27] Update dependencies from https://github.com/dotnet/xharness build 20220526.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22270.1 -> To Version 1.0.0-prerelease.22276.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0e48f23cbaa54c..f8a1f7eb5e7511 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22274.1", + "version": "1.0.0-prerelease.22276.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2337d189a6d335..3f3e5ff3e3038c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -242,17 +242,17 @@ https://github.com/dotnet/linker b0479355a71752de103a2aac89af5cdcdb0455ad - + https://github.com/dotnet/xharness - 01cb26a789458315f8ec7366c48b83249e607429 + 8fda60c83422bbf6e31690c2d96ab8adb7e60c63 - + https://github.com/dotnet/xharness - 01cb26a789458315f8ec7366c48b83249e607429 + 8fda60c83422bbf6e31690c2d96ab8adb7e60c63 - + https://github.com/dotnet/xharness - 01cb26a789458315f8ec7366c48b83249e607429 + 8fda60c83422bbf6e31690c2d96ab8adb7e60c63 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 35014ebfc7b49e..edca48037578e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ 1.1.0 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22274.1 - 1.0.0-prerelease.22274.1 - 1.0.0-prerelease.22274.1 + 1.0.0-prerelease.22276.1 + 1.0.0-prerelease.22276.1 + 1.0.0-prerelease.22276.1 1.1.0-alpha.0.22259.2 2.4.2-pre.22 0.12.0-pre.20 From cc750669f93a29ca0fe9f4ea4c8f535d5308620e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 May 2022 12:45:27 +0000 Subject: [PATCH 09/27] Update dependencies from https://github.com/dotnet/emsdk build 20220525.3 Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-preview.5.22268.1 -> To Version 7.0.0-preview.6.22275.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f3e5ff3e3038c..9817eba75d3844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/msquic 3d79a1f817e3cdd8bcd3b5b9986a8bf36fd71e5a - + https://github.com/dotnet/emsdk - 494cf3aeba587e09c395969fb61c5bb6dca43cda + 8c81cf2be64b071ce1622a666f2ea2a57c564889 https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index edca48037578e6..61fc798cc43350 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -184,7 +184,7 @@ 11.1.0-alpha.1.22259.2 11.1.0-alpha.1.22259.2 - 7.0.0-preview.6.22275.2 + 7.0.0-preview.6.22275.3 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda From 5fb085a5ea77dd6450ed73ce53bfd15df4cf53e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 May 2022 12:31:28 +0000 Subject: [PATCH 10/27] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220527.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.22252.2 -> To Version 7.0.0-preview1.22277.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9817eba75d3844..235e1920629daa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -282,9 +282,9 @@ https://github.com/dotnet/runtime-assets 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 - + https://github.com/dotnet/roslyn-analyzers - 04edea1ac503805a8d9a6959ec18e20bff506bb5 + b2c2cbef531dd778a6b4020a7f9fdda9d010923c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 61fc798cc43350..d8fda563b16dd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ 4.3.0-1.22206.2 4.3.0-1.22206.2 4.3.0-1.22206.2 - 7.0.0-preview1.22274.2 + 7.0.0-preview1.22277.2 4.3.0-1.22206.2 - 1.0.0-prerelease.22217.3 - 1.0.0-prerelease.22217.3 - 1.0.0-prerelease.22217.3 - 1.0.0-prerelease.22217.3 + 1.0.0-prerelease.22279.1 + 1.0.0-prerelease.22279.1 + 1.0.0-prerelease.22279.1 + 1.0.0-prerelease.22279.1 16.9.0-beta1.21055.5 2.0.0-beta3.22114.1 From 783694ee7c3f011d2be9e4d041c6963688f039b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 May 2022 12:14:06 +0000 Subject: [PATCH 12/27] Update dependencies from https://github.com/dotnet/runtime build 20220529.1 Microsoft.NET.Sdk.IL , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHost , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , System.Text.Json From Version 7.0.0-preview.5.22272.3 -> To Version 7.0.0-preview.6.22279.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e399dfd782afdf..1c33f2cfc08af8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,33 +210,33 @@ https://github.com/dotnet/llvm-project 54cc196d506692c366d9e116cdb3a9a56342f720 - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + 1466e404dfac7ad6af7e6877d26885ce42414120 - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + 1466e404dfac7ad6af7e6877d26885ce42414120 - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + 1466e404dfac7ad6af7e6877d26885ce42414120 - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + 1466e404dfac7ad6af7e6877d26885ce42414120 - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + 1466e404dfac7ad6af7e6877d26885ce42414120 - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + 1466e404dfac7ad6af7e6877d26885ce42414120 - + https://github.com/dotnet/runtime - 0864cc5539e0ddd109b443b0bee804878cd7ba76 + 1466e404dfac7ad6af7e6877d26885ce42414120 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index b5e8fb32f761d3..e84749e2bfcaa6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,12 +72,12 @@ 6.0.0-preview.1.102 - 7.0.0-preview.5.22272.3 - 7.0.0-preview.5.22272.3 - 7.0.0-preview.5.22272.3 + 7.0.0-preview.6.22279.1 + 7.0.0-preview.6.22279.1 + 7.0.0-preview.6.22279.1 3.1.0 - 7.0.0-preview.5.22272.3 + 7.0.0-preview.6.22279.1 1.0.0-alpha.1.22252.1 1.0.0-alpha.1.22252.1 1.0.0-alpha.1.22252.1 @@ -111,11 +111,11 @@ 5.0.0 5.0.0 4.9.0 - 7.0.0-preview.5.22272.3 + 7.0.0-preview.6.22279.1 6.0.0 4.5.4 4.5.0 - 7.0.0-preview.5.22272.3 + 7.0.0-preview.6.22279.1 7.0.0-beta.22273.1 7.0.0-beta.22273.1 diff --git a/global.json b/global.json index 5324692295d488..95b4a43d065eaf 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22255.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", - "Microsoft.NET.Sdk.IL": "7.0.0-preview.5.22272.3" + "Microsoft.NET.Sdk.IL": "7.0.0-preview.6.22279.1" } } From 89896c2d88aa0706611880a294803699f9125599 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 May 2022 02:42:26 +0000 Subject: [PATCH 13/27] Update dependencies from https://github.com/dotnet/icu build 20220530.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-preview.5.22269.3 -> To Version 7.0.0-preview.6.22280.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c33f2cfc08af8..a65719ad213e72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 69304bb50797c4202ab35af3dd71bce3c9847e4f + 956257702c819743ba09a520cf9502a4f3c5290a https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index e84749e2bfcaa6..c005a25cc229e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 7.0.100-1.22270.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.6.22275.2 + 7.0.0-preview.6.22280.1 7.0.0-alpha.1.22273.2 From 82a1cfe96db985c9caaec335e18c973fbc8fcb42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 May 2022 12:20:17 +0000 Subject: [PATCH 14/27] Update dependencies from https://github.com/dotnet/icu build 20220530.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-preview.5.22269.3 -> To Version 7.0.0-preview.6.22280.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20f333baaa16e6..2a9e21e2f82358 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 956257702c819743ba09a520cf9502a4f3c5290a + b05bfe5cc47b96705a4bbca5528adbba42dc7e50 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 643fea653c00de..3ee6222281d795 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 7.0.100-1.22270.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.6.22280.1 + 7.0.0-preview.6.22280.2 7.0.0-alpha.1.22273.2 From 2137cfb6770e5f790aa5084708c91811d258fe2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 May 2022 12:22:32 +0000 Subject: [PATCH 15/27] Update dependencies from https://github.com/dotnet/xharness build 20220530.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22270.1 -> To Version 1.0.0-prerelease.22280.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f8a1f7eb5e7511..3f8b1bedfd8340 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22276.1", + "version": "1.0.0-prerelease.22280.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a9e21e2f82358..43b218be0af1c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -242,17 +242,17 @@ https://github.com/dotnet/linker b0479355a71752de103a2aac89af5cdcdb0455ad - + https://github.com/dotnet/xharness - 8fda60c83422bbf6e31690c2d96ab8adb7e60c63 + 1bebb66ea04e0aa83bfc3b2338fe3c95025d80d1 - + https://github.com/dotnet/xharness - 8fda60c83422bbf6e31690c2d96ab8adb7e60c63 + 1bebb66ea04e0aa83bfc3b2338fe3c95025d80d1 - + https://github.com/dotnet/xharness - 8fda60c83422bbf6e31690c2d96ab8adb7e60c63 + 1bebb66ea04e0aa83bfc3b2338fe3c95025d80d1 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3ee6222281d795..ed4ba78304bce8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ 1.1.0 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22276.1 - 1.0.0-prerelease.22276.1 - 1.0.0-prerelease.22276.1 + 1.0.0-prerelease.22280.1 + 1.0.0-prerelease.22280.1 + 1.0.0-prerelease.22280.1 1.1.0-alpha.0.22273.2 2.4.2-pre.22 0.12.0-pre.20 From c2f5ea3ccc05115e163b1359f1ec70137a0e33cc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 31 May 2022 09:43:19 -0700 Subject: [PATCH 16/27] Add manual marshalling for non-blittable delegates defined in System.Drawing.Common (which has the DisableRuntimeMarshallingAttribute applied) passed to P/Invokes. --- .../src/System/Drawing/GdiplusNative.cs | 102 +++++++++++++++--- .../src/System/Drawing/Graphics.cs | 59 ++++++++++ .../src/System/Drawing/Image.cs | 28 +++++ 3 files changed, 172 insertions(+), 17 deletions(-) diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs index 660bb5d7bed3b5..0b43bd76869935 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs @@ -3281,7 +3281,11 @@ internal static partial int GdipDrawImageRectRectI( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef imageAttributes, Graphics.DrawImageAbort? callback, + HandleRef imageAttributes, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.DrawImageAbortMarshaller))] +#endif + Graphics.DrawImageAbort? callback, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -3300,7 +3304,11 @@ internal static partial int GdipDrawImagePointsRect( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef imageAttributes, Graphics.DrawImageAbort? callback, + HandleRef imageAttributes, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.DrawImageAbortMarshaller))] +#endif + Graphics.DrawImageAbort? callback, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -3319,7 +3327,11 @@ internal static partial int GdipDrawImageRectRect( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef imageAttributes, Graphics.DrawImageAbort? callback, + HandleRef imageAttributes, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.DrawImageAbortMarshaller))] +#endif + Graphics.DrawImageAbort? callback, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -3338,7 +3350,11 @@ internal static partial int GdipDrawImagePointsRectI( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef imageAttributes, Graphics.DrawImageAbort? callback, + HandleRef imageAttributes, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.DrawImageAbortMarshaller))] +#endif + Graphics.DrawImageAbort? callback, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4029,7 +4045,11 @@ internal static partial int GdipGetImageThumbnail( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef image, int thumbWidth, int thumbHeight, out IntPtr thumbImage, Image.GetThumbnailImageAbort? callback, IntPtr callbackdata); + HandleRef image, int thumbWidth, int thumbHeight, out IntPtr thumbImage, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Image.GetThumbnailImageAbortMarshaller))] +#endif + Image.GetThumbnailImageAbort? callback, IntPtr callbackdata); [LibraryImport(LibraryName)] internal static partial int GdipGetImagePalette( @@ -4131,7 +4151,11 @@ internal static partial int GdipEnumerateMetafileDestPoint( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, ref PointF destPoint, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, ref PointF destPoint, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4146,7 +4170,11 @@ internal static partial int GdipEnumerateMetafileDestPointI( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, ref Point destPoint, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, ref Point destPoint, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4161,7 +4189,11 @@ internal static partial int GdipEnumerateMetafileDestRect( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, ref RectangleF destRect, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, ref RectangleF destRect, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4176,7 +4208,11 @@ internal static partial int GdipEnumerateMetafileDestRectI( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, ref Rectangle destRect, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, ref Rectangle destRect, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4191,7 +4227,11 @@ internal static partial int GdipEnumerateMetafileDestPoints( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, PointF* destPoints, int count, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, PointF* destPoints, int count, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4206,7 +4246,11 @@ internal static partial int GdipEnumerateMetafileDestPointsI( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, Point* destPoints, int count, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, Point* destPoints, int count, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4221,7 +4265,11 @@ internal static partial int GdipEnumerateMetafileSrcRectDestPoint( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, ref PointF destPoint, ref RectangleF srcRect, GraphicsUnit pageUnit, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, ref PointF destPoint, ref RectangleF srcRect, GraphicsUnit pageUnit, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4236,7 +4284,11 @@ internal static partial int GdipEnumerateMetafileSrcRectDestPointI( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, ref Point destPoint, ref Rectangle srcRect, GraphicsUnit pageUnit, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, ref Point destPoint, ref Rectangle srcRect, GraphicsUnit pageUnit, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4251,7 +4303,11 @@ internal static partial int GdipEnumerateMetafileSrcRectDestRect( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, ref RectangleF destRect, ref RectangleF srcRect, GraphicsUnit pageUnit, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, ref RectangleF destRect, ref RectangleF srcRect, GraphicsUnit pageUnit, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4266,7 +4322,11 @@ internal static partial int GdipEnumerateMetafileSrcRectDestRectI( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, ref Rectangle destRect, ref Rectangle srcRect, GraphicsUnit pageUnit, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, ref Rectangle destRect, ref Rectangle srcRect, GraphicsUnit pageUnit, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4281,7 +4341,11 @@ internal static partial int GdipEnumerateMetafileSrcRectDestPoints( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, PointF* destPoints, int count, ref RectangleF srcRect, GraphicsUnit pageUnit, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, PointF* destPoints, int count, ref RectangleF srcRect, GraphicsUnit pageUnit, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif @@ -4296,7 +4360,11 @@ internal static partial int GdipEnumerateMetafileSrcRectDestPointsI( #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif - HandleRef metafile, Point* destPoints, int count, ref Rectangle srcRect, GraphicsUnit pageUnit, Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, + HandleRef metafile, Point* destPoints, int count, ref Rectangle srcRect, GraphicsUnit pageUnit, +#if NET7_0_OR_GREATER + [MarshalUsing(typeof(Graphics.EnumerateMetafileProcMarshaller))] +#endif + Graphics.EnumerateMetafileProc callback, IntPtr callbackdata, #if NET7_0_OR_GREATER [MarshalUsing(typeof(HandleRefMarshaller))] #endif diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.cs index b779a7d4a8d441..fb57368150ae16 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Graphics.cs @@ -11,6 +11,9 @@ using System.Numerics; using System.Runtime.InteropServices; using System.Runtime.Versioning; +#if NET7_0_OR_GREATER +using System.Runtime.InteropServices.Marshalling; +#endif using Gdip = System.Drawing.SafeNativeMethods.Gdip; namespace System.Drawing @@ -60,6 +63,31 @@ internal static string GetAllocationStack() { public delegate bool DrawImageAbort(IntPtr callbackdata); +#if NET7_0_OR_GREATER + [CustomTypeMarshaller(typeof(DrawImageAbort), CustomTypeMarshallerKind.Value, Direction = CustomTypeMarshallerDirection.In, Features = CustomTypeMarshallerFeatures.TwoStageMarshalling | CustomTypeMarshallerFeatures.UnmanagedResources)] + internal unsafe struct DrawImageAbortMarshaller + { + private delegate Interop.BOOL DrawImageAbortNative(IntPtr callbackdata); + private DrawImageAbortNative? _managed; + private delegate* unmanaged _nativeFunction; + public DrawImageAbortMarshaller(DrawImageAbort? managed) + { + _managed = managed is null ? null : data => managed(data) ? Interop.BOOL.TRUE : Interop.BOOL.FALSE; + _nativeFunction = _managed is null ? null : (delegate* unmanaged)Marshal.GetFunctionPointerForDelegate(_managed); + } + + public delegate* unmanaged ToNativeValue() + { + return _nativeFunction; + } + + public void FreeNative() + { + GC.KeepAlive(_managed); + } + } +#endif + /// /// Callback for EnumerateMetafile methods. /// This method can then call Metafile.PlayRecord to play the record that was just enumerated. @@ -77,6 +105,37 @@ public delegate bool EnumerateMetafileProc( IntPtr data, PlayRecordCallback callbackData); +#if NET7_0_OR_GREATER + [CustomTypeMarshaller(typeof(EnumerateMetafileProc), CustomTypeMarshallerKind.Value, Direction = CustomTypeMarshallerDirection.In, Features = CustomTypeMarshallerFeatures.TwoStageMarshalling | CustomTypeMarshallerFeatures.UnmanagedResources)] + internal unsafe struct EnumerateMetafileProcMarshaller + { + private delegate Interop.BOOL EnumerateMetafileProcNative( + EmfPlusRecordType recordType, + int flags, + int dataSize, + IntPtr data, + IntPtr callbackData); + private EnumerateMetafileProcNative? _managed; + private delegate* unmanaged _nativeFunction; + public EnumerateMetafileProcMarshaller(EnumerateMetafileProc? managed) + { + _managed = managed is null ? null : (recordType, flags, dataSize, data, callbackData) => + managed(recordType, flags, dataSize, data, Marshal.GetDelegateForFunctionPointer(callbackData)) ? Interop.BOOL.TRUE : Interop.BOOL.FALSE; + _nativeFunction = _managed is null ? null : (delegate* unmanaged)Marshal.GetFunctionPointerForDelegate(_managed); + } + + public delegate* unmanaged ToNativeValue() + { + return _nativeFunction; + } + + public void FreeNative() + { + GC.KeepAlive(_managed); + } + } +#endif + /// /// Constructor to initialize this object from a native GDI+ Graphics pointer. /// diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Image.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Image.cs index cc4c37999206f4..2493fe701ef978 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Image.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Image.cs @@ -10,6 +10,9 @@ using System.IO; using System.Runtime.InteropServices; using System.Runtime.Serialization; +#if NET7_0_OR_GREATER +using System.Runtime.InteropServices.Marshalling; +#endif using Gdip = System.Drawing.SafeNativeMethods.Gdip; namespace System.Drawing @@ -40,6 +43,31 @@ public abstract class Image : MarshalByRefObject, IDisposable, ICloneable, ISeri // to modify it, in order to preserve compatibility. public delegate bool GetThumbnailImageAbort(); +#if NET7_0_OR_GREATER + [CustomTypeMarshaller(typeof(GetThumbnailImageAbort), CustomTypeMarshallerKind.Value, Direction = CustomTypeMarshallerDirection.In, Features = CustomTypeMarshallerFeatures.TwoStageMarshalling | CustomTypeMarshallerFeatures.UnmanagedResources)] + internal unsafe struct GetThumbnailImageAbortMarshaller + { + private delegate Interop.BOOL GetThumbnailImageAbortNative(IntPtr callbackdata); + private GetThumbnailImageAbortNative _managed; + private delegate* unmanaged _nativeFunction; + public GetThumbnailImageAbortMarshaller(GetThumbnailImageAbort managed) + { + _managed = data => managed() ? Interop.BOOL.TRUE : Interop.BOOL.FALSE; + _nativeFunction = (delegate* unmanaged)Marshal.GetFunctionPointerForDelegate(_managed); + } + + public delegate* unmanaged ToNativeValue() + { + return _nativeFunction; + } + + public void FreeNative() + { + GC.KeepAlive(_managed); + } + } +#endif + internal IntPtr nativeImage; private object? _userData; From 30d16e23689d48353c61b959b3c46b6d136a066c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 12:26:04 +0000 Subject: [PATCH 17/27] Update dependencies from https://github.com/dotnet/xharness build 20220601.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22270.1 -> To Version 1.0.0-prerelease.22301.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3f8b1bedfd8340..adabf3099f6dad 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22280.1", + "version": "1.0.0-prerelease.22301.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43b218be0af1c3..514219e9b97b1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -242,17 +242,17 @@ https://github.com/dotnet/linker b0479355a71752de103a2aac89af5cdcdb0455ad - + https://github.com/dotnet/xharness - 1bebb66ea04e0aa83bfc3b2338fe3c95025d80d1 + ab6641a671670f05df7e09f2d8108491787e7cc9 - + https://github.com/dotnet/xharness - 1bebb66ea04e0aa83bfc3b2338fe3c95025d80d1 + ab6641a671670f05df7e09f2d8108491787e7cc9 - + https://github.com/dotnet/xharness - 1bebb66ea04e0aa83bfc3b2338fe3c95025d80d1 + ab6641a671670f05df7e09f2d8108491787e7cc9 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index ed4ba78304bce8..83ce34c01fdddd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ 1.1.0 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22280.1 - 1.0.0-prerelease.22280.1 - 1.0.0-prerelease.22280.1 + 1.0.0-prerelease.22301.1 + 1.0.0-prerelease.22301.1 + 1.0.0-prerelease.22301.1 1.1.0-alpha.0.22273.2 2.4.2-pre.22 0.12.0-pre.20 From b3ecc1426edda180fd79652d22b57feb7ae0e7cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 12:27:34 +0000 Subject: [PATCH 18/27] Update dependencies from https://github.com/dotnet/runtime-assets build 20220531.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.22267.1 -> To Version 7.0.0-beta.22281.1 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 514219e9b97b1c..f29f6dd80ad560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -130,53 +130,53 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf https://github.com/dotnet/llvm-project @@ -278,9 +278,9 @@ https://github.com/dotnet/hotreload-utils 91016bbeb8a39770ff6f049302916c37a0a49c25 - + https://github.com/dotnet/runtime-assets - 2646281bb4c2a5a6f6ea49ed7a6e10b001cee898 + 0920468fa7db4ee8ea8bbcba186421cb92713adf https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 83ce34c01fdddd..5c2b61b78847c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,19 +117,19 @@ 4.5.0 7.0.0-preview.6.22279.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 - 7.0.0-beta.22273.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 + 7.0.0-beta.22281.1 1.0.0-prerelease.22279.1 1.0.0-prerelease.22279.1 From c275164462c15ce64f3f5d570a665339ef58f90c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 12:43:14 +0000 Subject: [PATCH 19/27] Update dependencies from https://github.com/dotnet/emsdk build 20220531.1 Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-preview.5.22268.1 -> To Version 7.0.0-preview.6.22281.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f29f6dd80ad560..88e4fe6c47af20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/msquic 3d79a1f817e3cdd8bcd3b5b9986a8bf36fd71e5a - + https://github.com/dotnet/emsdk - 8c81cf2be64b071ce1622a666f2ea2a57c564889 + ea10b4e5534de1806cc2e84ddd3b00eabcab962f https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index 5c2b61b78847c0..d2948a925305a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -184,7 +184,7 @@ 11.1.0-alpha.1.22259.2 11.1.0-alpha.1.22259.2 - 7.0.0-preview.6.22275.3 + 7.0.0-preview.6.22281.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda From 83ad5ac2beb8b377ca2a4228a1d41ee9535e53b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jun 2022 12:48:01 +0000 Subject: [PATCH 20/27] Update dependencies from https://github.com/dotnet/msquic build 20220531.1 System.Net.MsQuic.Transport From Version 7.0.0-alpha.1.22273.1 -> To Version 7.0.0-alpha.1.22281.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88e4fe6c47af20..952c6eb1174a41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,9 +4,9 @@ https://github.com/dotnet/icu b05bfe5cc47b96705a4bbca5528adbba42dc7e50 - + https://github.com/dotnet/msquic - 3d79a1f817e3cdd8bcd3b5b9986a8bf36fd71e5a + fc2de489337c95e19ad6b5badb00c48a36b6a948 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index d2948a925305a3..fe0870f9f5bcdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,7 +173,7 @@ 7.0.0-preview.6.22280.2 - 7.0.0-alpha.1.22273.2 + 7.0.0-alpha.1.22281.1 11.1.0-alpha.1.22259.2 11.1.0-alpha.1.22259.2 From 59a9c85389f0ac964ecbaa9a0a9f44b3031c02f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Jun 2022 12:40:56 +0000 Subject: [PATCH 21/27] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220601.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.22252.2 -> To Version 7.0.0-preview1.22301.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 952c6eb1174a41..bce1b521964d8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -282,9 +282,9 @@ https://github.com/dotnet/runtime-assets 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/roslyn-analyzers - b2c2cbef531dd778a6b4020a7f9fdda9d010923c + a11d5d3d0e8bd177d8d634c261bbf37bd661ae67 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index fe0870f9f5bcdd..40aec06c3deb01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ 4.3.0-1.22206.2 4.3.0-1.22206.2 4.3.0-1.22206.2 - 7.0.0-preview1.22277.2 + 7.0.0-preview1.22301.1 4.3.0-1.22206.2 7.0.0-preview.6.22280.2 - 7.0.0-alpha.1.22281.1 + 7.0.0-alpha.1.22301.1 11.1.0-alpha.1.22259.2 11.1.0-alpha.1.22259.2 From 05c8cab6000aae4d930a4f803e2e3d0a3d066652 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 2 Jun 2022 09:01:19 -0700 Subject: [PATCH 23/27] Move OleDB to use more manual marshalling instead of delegate marshalling. --- .../System.Data.OleDb/src/OleDbWrapper.cs | 111 ++++++++++++++++-- .../src/UnsafeNativeMethods.cs | 26 ++-- 2 files changed, 113 insertions(+), 24 deletions(-) diff --git a/src/libraries/System.Data.OleDb/src/OleDbWrapper.cs b/src/libraries/System.Data.OleDb/src/OleDbWrapper.cs index bc458f68223e22..bb7f00064c3c1f 100644 --- a/src/libraries/System.Data.OleDb/src/OleDbWrapper.cs +++ b/src/libraries/System.Data.OleDb/src/OleDbWrapper.cs @@ -43,7 +43,7 @@ internal OleDbServicesWrapper(object? unknown) : base() } } - internal void GetDataSource(OleDbConnectionString constr, ref DataSourceWrapper datasrcWrapper) + internal unsafe void GetDataSource(OleDbConnectionString constr, ref DataSourceWrapper datasrcWrapper) { OleDbHResult hr; UnsafeNativeMethods.IDataInitializeGetDataSource GetDataSource = DangerousIDataInitializeGetDataSource!; @@ -59,7 +59,31 @@ internal void GetDataSource(OleDbConnectionString constr, ref DataSourceWrapper // base.handle is the 'this' pointer for making the COM call to GetDataSource // the datasrcWrapper will store the IID_IDBInitialize pointer // call IDataInitiailze::GetDataSource via the delegate - hr = GetDataSource(base.handle, IntPtr.Zero, ODB.CLSCTX_ALL, connectionString, ref ODB.IID_IDBInitialize, ref datasrcWrapper); + fixed (char* connectionStringPtr = connectionString) + fixed (Guid* riid = &ODB.IID_IDBInitialize) + { + bool addRefd = false; + DataSourceWrapper newWrapper = new DataSourceWrapper(); + datasrcWrapper.DangerousAddRef(ref addRefd); + IntPtr originalHandle = datasrcWrapper.DangerousGetHandle(); + IntPtr handle = originalHandle; + try + { + hr = GetDataSource(base.handle, IntPtr.Zero, ODB.CLSCTX_ALL, connectionStringPtr, riid, &handle); + } + finally + { + if (addRefd) + { + datasrcWrapper.DangerousRelease(); + } + if (handle != originalHandle) + { + Marshal.InitHandle(newWrapper, handle); + datasrcWrapper = newWrapper; + } + } + } } finally { @@ -98,7 +122,7 @@ public DataSourceWrapper() : base() { } - internal OleDbHResult InitializeAndCreateSession(OleDbConnectionString constr, ref SessionWrapper sessionWrapper) + internal unsafe OleDbHResult InitializeAndCreateSession(OleDbConnectionString constr, ref SessionWrapper sessionWrapper) { OleDbHResult hr; bool mustRelease = false; @@ -149,7 +173,10 @@ internal OleDbHResult InitializeAndCreateSession(OleDbConnectionString constr, r if ((0 <= hr) || (OleDbHResult.DB_E_ALREADYINITIALIZED == hr)) { // call IUnknown::QueryInterface via the delegate - hr = (OleDbHResult)QueryInterface(base.handle, ref ODB.IID_IDBCreateSession, ref idbCreateSession); + fixed (Guid* riid = &ODB.IID_IDBCreateSession) + { + hr = (OleDbHResult)QueryInterface(base.handle, riid, &idbCreateSession); + } if ((0 <= hr) && (IntPtr.Zero != idbCreateSession)) { // native COM rules are the QI result is the 'this' pointer @@ -172,7 +199,30 @@ internal OleDbHResult InitializeAndCreateSession(OleDbConnectionString constr, r if (null != constr.DangerousIDBCreateCommandCreateCommand) { // call IDBCreateSession::CreateSession via the delegate directly for IDBCreateCommand - hr = CreateSession(idbCreateSession, IntPtr.Zero, ref ODB.IID_IDBCreateCommand, ref sessionWrapper); + fixed (Guid* riid = &ODB.IID_IDBCreateCommand) + { + bool addRefd = false; + SessionWrapper newWrapper = new SessionWrapper(); + sessionWrapper.DangerousAddRef(ref addRefd); + IntPtr originalHandle = sessionWrapper.DangerousGetHandle(); + IntPtr handle = originalHandle; + try + { + hr = CreateSession(idbCreateSession, IntPtr.Zero, riid, &handle); + } + finally + { + if (addRefd) + { + sessionWrapper.DangerousRelease(); + } + if (handle != originalHandle) + { + Marshal.InitHandle(newWrapper, handle); + sessionWrapper = newWrapper; + } + } + } if ((0 <= hr) && !sessionWrapper.IsInvalid) { // double check the cached delegate is correct @@ -182,7 +232,30 @@ internal OleDbHResult InitializeAndCreateSession(OleDbConnectionString constr, r else { // otherwise ask for IUnknown (it may be first time usage or IDBCreateCommand not supported) - hr = CreateSession(idbCreateSession, IntPtr.Zero, ref ODB.IID_IUnknown, ref sessionWrapper); + fixed (Guid* riid = &ODB.IID_IUnknown) + { + bool addRefd = false; + SessionWrapper newWrapper = new SessionWrapper(); + sessionWrapper.DangerousAddRef(ref addRefd); + IntPtr originalHandle = sessionWrapper.DangerousGetHandle(); + IntPtr handle = originalHandle; + try + { + hr = CreateSession(idbCreateSession, IntPtr.Zero, riid, &handle); + } + finally + { + if (addRefd) + { + sessionWrapper.DangerousRelease(); + } + if (handle != originalHandle) + { + Marshal.InitHandle(newWrapper, handle); + sessionWrapper = newWrapper; + } + } + } if ((0 <= hr) && !sessionWrapper.IsInvalid) { // and check support for IDBCreateCommand and create delegate for CreateCommand @@ -238,7 +311,7 @@ public SessionWrapper() : base() // if OleDbConnectionString.DangerousIDBCreateCommandCreateCommand does not exist // this method will be called to query for IDBCreateCommand (and cache that interface pointer) // or it will be known that IDBCreateCommand is not supported - internal void QueryInterfaceIDBCreateCommand(OleDbConnectionString constr) + internal unsafe void QueryInterfaceIDBCreateCommand(OleDbConnectionString constr) { // DangerousAddRef/DangerousRelease are not neccessary here in the current implementation // only used from within OleDbConnectionInternal.ctor->DataSourceWrapper.InitializeAndCreateSession @@ -266,7 +339,11 @@ internal void QueryInterfaceIDBCreateCommand(OleDbConnectionString constr) IntPtr method = Marshal.ReadIntPtr(vtable, 0); UnsafeNativeMethods.IUnknownQueryInterface QueryInterface = (UnsafeNativeMethods.IUnknownQueryInterface)Marshal.GetDelegateForFunctionPointer(method, typeof(UnsafeNativeMethods.IUnknownQueryInterface)); - int hresult = QueryInterface(base.handle, ref ODB.IID_IDBCreateCommand, ref idbCreateCommand); + int hresult; + fixed (Guid* riid = &ODB.IID_IDBCreateCommand) + { + hresult = QueryInterface(base.handle, riid, &idbCreateCommand); + } if ((0 <= hresult) && (IntPtr.Zero != idbCreateCommand)) { vtable = Marshal.ReadIntPtr(idbCreateCommand, 0); @@ -321,21 +398,32 @@ internal void VerifyIDBCreateCommand(OleDbConnectionString constr) DangerousIDBCreateCommandCreateCommand = CreateCommand; } - internal OleDbHResult CreateCommand(ref object? icommandText) + internal unsafe OleDbHResult CreateCommand(ref object? icommandText) { // if (null == CreateCommand), the IDBCreateCommand isn't supported - aka E_NOINTERFACE OleDbHResult hr = OleDbHResult.E_NOINTERFACE; UnsafeNativeMethods.IDBCreateCommandCreateCommand? CreateCommand = DangerousIDBCreateCommandCreateCommand; if (null != CreateCommand) { + IntPtr nativeICommandText = IntPtr.Zero; bool mustRelease = false; RuntimeHelpers.PrepareConstrainedRegions(); try { DangerousAddRef(ref mustRelease); - // call IDBCreateCommand::CreateCommand via the delegate directly for IDBCreateCommand - hr = CreateCommand(base.handle, IntPtr.Zero, ref ODB.IID_ICommandText, ref icommandText); + if (icommandText is not null) + { + nativeICommandText = Marshal.GetIUnknownForObject(icommandText); + } + + fixed (Guid* riid = &ODB.IID_ICommandText) + { + // call IDBCreateCommand::CreateCommand via the delegate directly for IDBCreateCommand + hr = CreateCommand(base.handle, IntPtr.Zero, riid, &nativeICommandText); + } + + icommandText = Marshal.GetObjectForIUnknown(nativeICommandText); } finally { @@ -343,6 +431,7 @@ internal OleDbHResult CreateCommand(ref object? icommandText) { DangerousRelease(); } + Marshal.Release(nativeICommandText); } } return hr; diff --git a/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.cs b/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.cs index ed5bbe6d69ae03..8238379f701054 100644 --- a/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.cs +++ b/src/libraries/System.Data.OleDb/src/UnsafeNativeMethods.cs @@ -773,20 +773,20 @@ System.Data.OleDb.OleDbHResult StartTransaction( // dangerous delegate around IUnknown::QueryInterface (0th vtable entry) [SuppressUnmanagedCodeSecurity] - internal delegate int IUnknownQueryInterface( + internal unsafe delegate int IUnknownQueryInterface( IntPtr pThis, - ref Guid riid, - ref IntPtr ppInterface); + Guid* riid, + IntPtr* ppInterface); // dangerous delegate around IDataInitialize::GetDataSource (4th vtable entry) [SuppressUnmanagedCodeSecurity] - internal delegate System.Data.OleDb.OleDbHResult IDataInitializeGetDataSource( + internal unsafe delegate System.Data.OleDb.OleDbHResult IDataInitializeGetDataSource( IntPtr pThis, // first parameter is always the 'this' value, must use use result from QI IntPtr pUnkOuter, int dwClsCtx, - [MarshalAs(UnmanagedType.LPWStr)] string pwszInitializationString, - ref Guid riid, - ref System.Data.OleDb.DataSourceWrapper ppDataSource); + char* pwszInitializationString, + Guid* riid, + IntPtr* ppDataSource); // dangerous wrapper around IDBInitialize::Initialize (4th vtable entry) [SuppressUnmanagedCodeSecurity] @@ -795,19 +795,19 @@ internal delegate System.Data.OleDb.OleDbHResult IDBInitializeInitialize( // dangerous wrapper around IDBCreateSession::CreateSession (4th vtable entry) [SuppressUnmanagedCodeSecurity] - internal delegate System.Data.OleDb.OleDbHResult IDBCreateSessionCreateSession( + internal unsafe delegate System.Data.OleDb.OleDbHResult IDBCreateSessionCreateSession( IntPtr pThis, // first parameter is always the 'this' value, must use use result from QI IntPtr pUnkOuter, - ref Guid riid, - ref System.Data.OleDb.SessionWrapper ppDBSession); + Guid* riid, + IntPtr* ppDBSession); // dangerous wrapper around IDBCreateCommand::CreateCommand (4th vtable entry) [SuppressUnmanagedCodeSecurity] - internal delegate System.Data.OleDb.OleDbHResult IDBCreateCommandCreateCommand( + internal unsafe delegate System.Data.OleDb.OleDbHResult IDBCreateCommandCreateCommand( IntPtr pThis, // first parameter is always the 'this' value, must use use result from QI IntPtr pUnkOuter, - ref Guid riid, - [MarshalAs(UnmanagedType.Interface)] ref object? ppCommand); + Guid* riid, + IntPtr* ppCommand); // // Advapi32.dll Integrated security functions From f828980ea51c55918137bebebe82d458cfe71e70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Jun 2022 12:32:11 +0000 Subject: [PATCH 24/27] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20220602.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.22252.2 -> To Version 7.0.0-preview1.22302.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbd42ecc98b023..de13610f4e351a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -282,9 +282,9 @@ https://github.com/dotnet/runtime-assets 0920468fa7db4ee8ea8bbcba186421cb92713adf - + https://github.com/dotnet/roslyn-analyzers - a11d5d3d0e8bd177d8d634c261bbf37bd661ae67 + 114d5f2927b8afc90f169df80fdcbe8c7a644bac https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 52e286790c9bb4..60067c4de034da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ 4.3.0-1.22206.2 4.3.0-1.22206.2 4.3.0-1.22206.2 - 7.0.0-preview1.22301.1 + 7.0.0-preview1.22302.1 4.3.0-1.22206.2 6.0.0-preview.1.102 - 7.0.0-preview.6.22279.1 - 7.0.0-preview.6.22279.1 - 7.0.0-preview.6.22279.1 + 7.0.0-preview.6.22305.4 + 7.0.0-preview.6.22305.4 + 7.0.0-preview.6.22305.4 3.1.0 - 7.0.0-preview.6.22279.1 + 7.0.0-preview.6.22305.4 1.0.0-alpha.1.22252.1 1.0.0-alpha.1.22252.1 1.0.0-alpha.1.22252.1 @@ -111,11 +111,11 @@ 5.0.0 5.0.0 4.9.0 - 7.0.0-preview.6.22279.1 + 7.0.0-preview.6.22305.4 6.0.0 4.5.4 4.5.0 - 7.0.0-preview.6.22279.1 + 7.0.0-preview.6.22305.4 7.0.0-beta.22281.1 7.0.0-beta.22281.1 diff --git a/global.json b/global.json index f8db5102aa278c..7809f8ebf190d0 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22266.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", - "Microsoft.NET.Sdk.IL": "7.0.0-preview.6.22279.1" + "Microsoft.NET.Sdk.IL": "7.0.0-preview.6.22305.4" } } From e9c23217b6b072b4d6d542e527dc188cfa6ab29f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Jun 2022 12:19:30 +0000 Subject: [PATCH 26/27] Update dependencies from https://github.com/dotnet/xharness build 20220605.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.22270.1 -> To Version 1.0.0-prerelease.22305.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index adabf3099f6dad..76d5359f980ba1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22301.1", + "version": "1.0.0-prerelease.22305.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90caeddc102af5..b63742aa3047b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -242,17 +242,17 @@ https://github.com/dotnet/linker b0479355a71752de103a2aac89af5cdcdb0455ad - + https://github.com/dotnet/xharness - ab6641a671670f05df7e09f2d8108491787e7cc9 + a1d9a67e971fc0b8724507847491fe93f65728db - + https://github.com/dotnet/xharness - ab6641a671670f05df7e09f2d8108491787e7cc9 + a1d9a67e971fc0b8724507847491fe93f65728db - + https://github.com/dotnet/xharness - ab6641a671670f05df7e09f2d8108491787e7cc9 + a1d9a67e971fc0b8724507847491fe93f65728db https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 270f159247e81c..8b6537c3863ae2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ 1.1.0 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22301.1 - 1.0.0-prerelease.22301.1 - 1.0.0-prerelease.22301.1 + 1.0.0-prerelease.22305.1 + 1.0.0-prerelease.22305.1 + 1.0.0-prerelease.22305.1 1.1.0-alpha.0.22281.2 2.4.2-pre.22 0.12.0-pre.20 From 693eb07672d15aca6f504a0ef46dad24f971ca1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Jun 2022 12:22:22 +0000 Subject: [PATCH 27/27] Update dependencies from https://github.com/dotnet/icu build 20220606.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-preview.5.22269.3 -> To Version 7.0.0-preview.6.22306.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b63742aa3047b9..42d34f24df9225 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - b05bfe5cc47b96705a4bbca5528adbba42dc7e50 + 7c13e1a1740e54ba0c9b38636ae36195c9e9d3bd https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 8b6537c3863ae2..e46b304b5e384c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 7.0.100-1.22270.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.6.22280.2 + 7.0.0-preview.6.22306.1 7.0.0-alpha.1.22301.1