From 9364cb57542daa10a0f410c729d3da2febf58716 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Sep 2023 15:27:18 +0000 Subject: [PATCH 01/16] Update dependencies from https://github.com/dotnet/installer build 20230921.13 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rtm.23471.13 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.ILLink.Tasks From Version 8.0.0-rc.2.23466.4 -> To Version 8.0.0-rc.2.23469.9 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb02dc87077..f0e915c354a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - e1fd7d964980ed478fa30457cf750e81105caee1 + 1de2c23f774d521972cd5941c32eb739847189c8 - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + 575843df1aeb430a3071e2e494d29b59080751ad https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 5099b035dd7..a09609721da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 8.0.100-rc.2.23468.1 - 8.0.0-rc.2.23466.4 - 8.0.0-rc.2.23466.4 + 8.0.100-rtm.23471.13 + 8.0.0-rc.2.23469.9 + 8.0.0-rc.2.23469.9 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-rc.2.23463.1 From d7da306569e8483713acfb898db4bfff9cf2951e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Sep 2023 12:25:45 +0000 Subject: [PATCH 02/16] Update dependencies from https://github.com/dotnet/installer build 20230922.18 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rtm.23472.18 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 8.0.0-rc.2.23466.4 -> To Version 8.0.0-rtm.23472.12 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0e915c354a..8ec8e7e3fb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - 1de2c23f774d521972cd5941c32eb739847189c8 + e5f2583273b33351becf30f4e0bcef6215aef36c - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/runtime - 575843df1aeb430a3071e2e494d29b59080751ad + e95228dbcf7a69f87b00da969b0cabf2e62ab207 - + https://github.com/dotnet/emsdk - 1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc + 446eeb331fcbf2f48c14a377601a8ab950ec942e - + https://github.com/dotnet/cecil - a112f15aa032c029b7d9c77df3427111d93cf407 + 89be445dd4936157533ad96bafb95f701430653a diff --git a/eng/Versions.props b/eng/Versions.props index a09609721da..1d225130f14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 8.0.100-rtm.23471.13 - 8.0.0-rc.2.23469.9 - 8.0.0-rc.2.23469.9 + 8.0.100-rtm.23472.18 + 8.0.0-rtm.23472.12 + 8.0.0-rtm.23472.12 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-rc.2.23463.1 + 8.0.0-rtm.23470.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.23461.1 + 0.11.4-alpha.23468.2 $(MicrosoftNETCoreAppRefPackageVersion) From bd3c0b5fc6fdb4b9ebfacd845a207280ba5604b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Sep 2023 12:23:31 +0000 Subject: [PATCH 03/16] Update dependencies from https://github.com/dotnet/installer build 20230922.18 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rtm.23472.18 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 8.0.0-rc.2.23466.4 -> To Version 8.0.0-rtm.23472.12 (parent: Microsoft.Dotnet.Sdk.Internal From 9fbef6a880ed7a126fe62394ca2e17eaef4a431a Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 22 Sep 2023 10:30:41 -0500 Subject: [PATCH 04/16] dotnet/runtime 7.0.12 --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ed561d2bd3..842814fd082 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,9 @@ - - - + + + From d700b7f2e04282ec15bb2b7ba37a3883f08133f1 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 22 Sep 2023 14:35:32 -0500 Subject: [PATCH 05/16] dotnet/runtime 6.0.23 --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 842814fd082..1eda387eb45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,8 @@ + + From bf4f32aa12c9cda880451a0d04bbcf07f50fc007 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 22 Sep 2023 16:04:22 -0500 Subject: [PATCH 06/16] Pass `-p:RestoreConfigFile` to `Java.Interop.sln` --- build-tools/scripts/DotNet.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index 2c477fe1b55..a08158da463 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -17,7 +17,7 @@ From cba5bc530dc3172e667e40cd970284edbaadfd48 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Sun, 24 Sep 2023 23:15:16 -0500 Subject: [PATCH 07/16] Bump to xamarin/monodroid/main@6c16fb50 Changes: xamarin/monodroid@8908d6a...6c16fb5 --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index b0955939ad3..4f4d7fcacde 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:main@c36049815ca04379194dd32f402f56beb5b992d3 +xamarin/monodroid:main@6c16fb50a77cf7d5a040c67b0e970e090ba4ce6e mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d From 436f823869455779575bd1ecffb8083e90bfef87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Sep 2023 12:24:00 +0000 Subject: [PATCH 08/16] Update dependencies from https://github.com/dotnet/installer build 20230924.2 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rtm.23474.2 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 8.0.0-rc.2.23466.4 -> To Version 8.0.0-rtm.23472.12 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 8ec8e7e3fb5..758c0771d44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - e5f2583273b33351becf30f4e0bcef6215aef36c + f8a61a24ac843529a82a8f6ede35fc08a6fb8c35 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1d225130f14..98410139276 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rtm.23472.18 + 8.0.100-rtm.23474.2 8.0.0-rtm.23472.12 8.0.0-rtm.23472.12 7.0.0-beta.22103.1 From 51ba0591e336eb9dac0e8efa9f6b4a82f51f6090 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 08:49:05 -0500 Subject: [PATCH 09/16] Mono/emsdk version bands are 8.0.100-rtm --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 98410139276..47bbc369b3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ \-(preview|rc|alpha).\d+ $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), $(VersionSuffixRegex))) $(DotNetPreviewVersionBand) - $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETCoreAppRefPackageVersion), $(VersionSuffixRegex))) - $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadEmscriptenPackageVersion), $(VersionSuffixRegex))) + 8.0.100-rtm + 8.0.100-rtm $(DotNetPreviewVersionBand) From 61cf5dbdd6e00dee84a11acfb56506079ac03432 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Sep 2023 12:28:20 +0000 Subject: [PATCH 10/16] Update dependencies from https://github.com/dotnet/installer build 20230925.14 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rtm.23475.14 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 8.0.0-rc.2.23466.4 -> To Version 8.0.0-rtm.23472.12 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 758c0771d44..38eee3b3586 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - f8a61a24ac843529a82a8f6ede35fc08a6fb8c35 + 2ff90f1abc52c3fc02812bad157e2985040a77a1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 47bbc369b3a..3edd7363655 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rtm.23474.2 + 8.0.100-rtm.23475.14 8.0.0-rtm.23472.12 8.0.0-rtm.23472.12 7.0.0-beta.22103.1 From d52c6f80c25b3787febabf4b8a8bb4cfce066335 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 Sep 2023 08:59:45 -0500 Subject: [PATCH 11/16] Revert "Pass `-p:RestoreConfigFile` to `Java.Interop.sln`" This reverts commit bf4f32aa12c9cda880451a0d04bbcf07f50fc007. --- build-tools/scripts/DotNet.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index a08158da463..2c477fe1b55 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -17,7 +17,7 @@ From eba2d198fd2eb3ccb18a6bd0d1964e10071603b6 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 Sep 2023 08:59:55 -0500 Subject: [PATCH 12/16] Revert "dotnet/runtime 6.0.23" This reverts commit d700b7f2e04282ec15bb2b7ba37a3883f08133f1. --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1eda387eb45..842814fd082 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,8 +14,6 @@ - - From e8a23377958865143b87a271aeb6e82777f63799 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 Sep 2023 09:00:04 -0500 Subject: [PATCH 13/16] Revert "dotnet/runtime 7.0.12" This reverts commit 9fbef6a880ed7a126fe62394ca2e17eaef4a431a. --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 842814fd082..1ed561d2bd3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,9 @@ - - - + + + From ae6230710c8002f664e558fd60707b4ada0b9477 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 Sep 2023 09:00:48 -0500 Subject: [PATCH 14/16] Revert "Bump to xamarin/monodroid/main@6c16fb50" This reverts commit cba5bc530dc3172e667e40cd970284edbaadfd48. --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 4f4d7fcacde..b0955939ad3 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:main@6c16fb50a77cf7d5a040c67b0e970e090ba4ce6e +xamarin/monodroid:main@c36049815ca04379194dd32f402f56beb5b992d3 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d From cf218f1f6f94a14977debd55c31548de51d36e96 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 Sep 2023 09:49:07 -0500 Subject: [PATCH 15/16] Revert "Revert "dotnet/runtime 7.0.12"" This reverts commit e8a23377958865143b87a271aeb6e82777f63799. --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ed561d2bd3..842814fd082 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,9 @@ - - - + + + From c3bcf409bc4f5d96ab41a530143750730b630073 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 Sep 2023 09:49:12 -0500 Subject: [PATCH 16/16] Revert "Revert "dotnet/runtime 6.0.23"" This reverts commit eba2d198fd2eb3ccb18a6bd0d1964e10071603b6. --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 842814fd082..1eda387eb45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,8 @@ + +