diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 914e6cbca..0ccab928b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 18df0320bb18ad55b2f7558f6df9c859f8faaa34 + 81b8d1656732c9fd5385e103f11e42988c07ec0b - + https://github.com/dotnet/windowsdesktop - 18df0320bb18ad55b2f7558f6df9c859f8faaa34 + 81b8d1656732c9fd5385e103f11e42988c07ec0b - + https://github.com/dotnet/windowsdesktop - 18df0320bb18ad55b2f7558f6df9c859f8faaa34 + 81b8d1656732c9fd5385e103f11e42988c07ec0b - + https://github.com/dotnet/windowsdesktop - 18df0320bb18ad55b2f7558f6df9c859f8faaa34 + 81b8d1656732c9fd5385e103f11e42988c07ec0b - + https://github.com/dotnet/runtime - 5707668eac999163740e42c70f228772e6bc3680 + 74e1d4df5733dda34a601a004aae720718184788 - + https://github.com/dotnet/runtime - 5707668eac999163740e42c70f228772e6bc3680 + 74e1d4df5733dda34a601a004aae720718184788 - + https://github.com/dotnet/runtime - 5707668eac999163740e42c70f228772e6bc3680 + 74e1d4df5733dda34a601a004aae720718184788 - + https://github.com/dotnet/runtime - 5707668eac999163740e42c70f228772e6bc3680 + 74e1d4df5733dda34a601a004aae720718184788 - + https://github.com/dotnet/runtime - 5707668eac999163740e42c70f228772e6bc3680 + 74e1d4df5733dda34a601a004aae720718184788 - + https://github.com/dotnet/runtime - 5707668eac999163740e42c70f228772e6bc3680 + 74e1d4df5733dda34a601a004aae720718184788 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5707668eac999163740e42c70f228772e6bc3680 + 74e1d4df5733dda34a601a004aae720718184788 - + https://github.com/dotnet/aspnetcore - d800343a77e26cb48a14351c020a4c38cb04a2b1 + 7a1a1ebf86fb24d84cefd45e05534c79708c7947 - + https://github.com/dotnet/aspnetcore - d800343a77e26cb48a14351c020a4c38cb04a2b1 + 7a1a1ebf86fb24d84cefd45e05534c79708c7947 - + https://github.com/dotnet/aspnetcore - d800343a77e26cb48a14351c020a4c38cb04a2b1 + 7a1a1ebf86fb24d84cefd45e05534c79708c7947 - + https://github.com/dotnet/aspnetcore - d800343a77e26cb48a14351c020a4c38cb04a2b1 + 7a1a1ebf86fb24d84cefd45e05534c79708c7947 - + https://github.com/dotnet/aspnetcore - d800343a77e26cb48a14351c020a4c38cb04a2b1 + 7a1a1ebf86fb24d84cefd45e05534c79708c7947 - + https://github.com/dotnet/aspnetcore - d800343a77e26cb48a14351c020a4c38cb04a2b1 + 7a1a1ebf86fb24d84cefd45e05534c79708c7947 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ 619f465fa426ccb543fb16cbcdb8d9a7c4004fb9 - + https://github.com/dotnet/sdk - b5bd17f24c4751b86eff13a53e91bee234a06dec + 6c5d3376a4f581090be1f8cd453907166209fe4f - + https://github.com/dotnet/sdk - b5bd17f24c4751b86eff13a53e91bee234a06dec + 6c5d3376a4f581090be1f8cd453907166209fe4f - + https://github.com/dotnet/winforms - 8dfd08de957e7e2b8f697c816032285fdf1dcf0f + 945d389d80122054e2e24766ede9df8bba573e03 - + https://github.com/dotnet/wpf - 8894edfa41143b7d695aa91626218938064f7381 + 505179b0962cd6d607e87d60efa0859e953c5e3c https://github.com/dotnet/fsharp @@ -130,25 +130,25 @@ 8854f5d1f3bd7e60d42565a18a2f8c06ae307474 - + https://github.com/microsoft/vstest - 2f3ea69370ef915a7e8cf512c0ea72b6ee5e9481 + 5eba36183bb2596d7b9f89291dc8e3e9fb4c20a6 - + https://github.com/dotnet/linker - 805c6a7f868348bc2400fcacb4f00998bd67b60d + 6564aad35881703832aab9edb81558e0b6dd5698 linker - + https://github.com/dotnet/roslyn - f2d278f9a5131b7944d6ac5fecf2ce5b0a98195f + 7a9af1cec6aa75c9e3ae0a142adcdb094aa0253b - + https://github.com/dotnet/msbuild - b701430ed91653a80926f4ad011bfa9e91eb4840 + 44ad46fed8c5f7e5800e93f61f265b2efaa8ea5e @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - eb809c8854de4d1bdf227a55550af01a1bb38e4b + f41e658e85769eef222f5f7571038edbd2d1d9d8 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 5c830913c..02f899e50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-preview.4.22213.1 + 7.0.0-preview.4.22216.2 - 7.0.0-preview.4.22213.3 + 7.0.0-preview.4.22216.2 @@ -52,44 +52,44 @@ - 7.0.0-preview.4.22213.16 - 7.0.0-preview.4.22213.16 - 7.0.0-preview.4.22213.16 - 7.0.0-preview.4.22213.16 - 7.0.0-preview.4.22213.16 - 7.0.0-preview.4.22213.16 + 7.0.0-preview.4.22218.8 + 7.0.0-preview.4.22218.8 + 7.0.0-preview.4.22218.8 + 7.0.0-preview.4.22218.8 + 7.0.0-preview.4.22218.8 + 7.0.0-preview.4.22218.8 0.2.0 - 7.0.100-preview.4.22214.21 - 7.0.100-preview.4.22214.21 + 7.0.100-preview.4.22218.15 + 7.0.100-preview.4.22218.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.4.22211.8 + 7.0.0-preview.4.22217.5 - 7.0.0-preview.4.22211.8 - 7.0.0-preview.4.22211.8 - 7.0.0-preview.4.22211.8 - 7.0.0-preview.4.22211.8 - 7.0.0-preview.4.22211.8 - 7.0.0-preview.4.22211.8 + 7.0.0-preview.4.22217.5 + 7.0.0-preview.4.22217.5 + 7.0.0-preview.4.22217.5 + 7.0.0-preview.4.22217.5 + 7.0.0-preview.4.22217.5 + 7.0.0-preview.4.22217.5 2.1.0 - 7.0.0-preview.4.22213.5 - 7.0.0-preview.4.22213.5 - 7.0.0-preview.4.22213.5 - 7.0.0-preview.4.22213.5 + 7.0.0-preview.4.22217.1 + 7.0.0-preview.4.22217.1 + 7.0.0-preview.4.22217.1 + 7.0.0-preview.4.22217.1 @@ -167,7 +167,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220414-01 + 17.3.0-preview-20220414-05 @@ -200,7 +200,7 @@ 12.1.301-preview.13.2 15.2.301-preview.13.2 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-preview.4.22201.2 + 7.0.0-preview.4.22215.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch b/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch deleted file mode 100644 index f7d7668dc..000000000 --- a/src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Wed, 13 Apr 2022 21:30:39 +0000 -Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build - -Removes prebuilt. -Patch for https://github.com/dotnet/linker/pull/2742 ---- - src/linker/Mono.Linker.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj -index 391300aa..d276003e 100644 ---- a/src/linker/Mono.Linker.csproj -+++ b/src/linker/Mono.Linker.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - runtime; build; native; contentfiles; analyzers; buildtransitive - all -