From 211c377286d50b1e0fd96cccdede21dfb00f5300 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Sep 2023 21:53:26 +0000 Subject: [PATCH 01/18] Update dependencies from https://github.com/dotnet/installer build 20230921.16 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23471.16 --- 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 fb02dc87077..1c75d37d52b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - e1fd7d964980ed478fa30457cf750e81105caee1 + f1b52f68f890dc8a60ca883cb57c7f1be5854564 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5099b035dd7..380359124da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rc.2.23468.1 + 8.0.100-rc.2.23471.16 8.0.0-rc.2.23466.4 8.0.0-rc.2.23466.4 7.0.0-beta.22103.1 From ba2d6fc3d59b10972b2c30f22119be5390f2ee13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Sep 2023 12:28:15 +0000 Subject: [PATCH 02/18] Update dependencies from https://github.com/dotnet/installer build 20230921.16 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23471.16 From bf8a633508e03ccfa73cf41fa3e8f0ba13fe5406 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 22 Sep 2023 10:30:41 -0500 Subject: [PATCH 03/18] 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 0f1f4403858a1fab5ed88217e04418b9986ae450 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 22 Sep 2023 14:35:32 -0500 Subject: [PATCH 04/18] 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 1f8a122a07cdd51eb0b2d4194034f6fa05466877 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 22 Sep 2023 16:04:22 -0500 Subject: [PATCH 05/18] 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 f8d2c17ed891671b832365fa317ccac9c7ad76fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Sep 2023 12:25:19 +0000 Subject: [PATCH 06/18] Update dependencies from https://github.com/dotnet/installer build 20230922.8 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23472.8 --- 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 1c75d37d52b..535b764106f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - f1b52f68f890dc8a60ca883cb57c7f1be5854564 + e13fd5c19e383f99132b1bfd2496857db089b680 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 380359124da..ef40496657e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rc.2.23471.16 + 8.0.100-rc.2.23472.8 8.0.0-rc.2.23466.4 8.0.0-rc.2.23466.4 7.0.0-beta.22103.1 From f0ddfdcccb76265bf9c50e42d0a817fb5277e7c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Sep 2023 12:23:07 +0000 Subject: [PATCH 07/18] Update dependencies from https://github.com/dotnet/installer build 20230922.8 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23472.8 From 80e6fd126d79e25166f4f2a81104c4d2252b0d86 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Sun, 24 Sep 2023 23:15:16 -0500 Subject: [PATCH 08/18] Bump to xamarin/monodroid/main@6c16fb50 Changes: https://github.com/xamarin/monodroid/compare/8908d6a1...6c16fb50 --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 36f40932945..4f4d7fcacde 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:main@8908d6a1c4fdfa8d3cc391d1d78f23f88a8ce6fb +xamarin/monodroid:main@6c16fb50a77cf7d5a040c67b0e970e090ba4ce6e mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d From fdeac57aa6ad5fbd25a429a8918968a738d90c66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Sep 2023 12:23:30 +0000 Subject: [PATCH 09/18] Update dependencies from https://github.com/dotnet/installer build 20230922.8 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23472.8 From 4c2861e326d15b5d2712bb7db9b2207c2a9ab7fc Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 08:42:54 -0500 Subject: [PATCH 10/18] Pass `-p:RestoreConfigFile` more places --- Makefile | 2 +- build-tools/automation/azure-pipelines-nightly.yaml | 4 +++- build-tools/automation/azure-pipelines.yaml | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 064b86f7005..b7e83467918 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,7 @@ include build-tools/scripts/runtime-helpers.mk prepare: $(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS) $(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln - $(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop + $(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop -p:RestoreConfigFile=NuGet.config .PHONY: prepare-help prepare-help: diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index a67b701fbb3..c11420f9531 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -118,7 +118,9 @@ stages: - template: yaml-templates/run-dotnet-preview.yaml parameters: project: Xamarin.Android.sln - arguments: -t:PrepareJavaInterop -c $(XA.Build.Configuration) -m:1 -v:n + arguments: >- + -t:PrepareJavaInterop -c $(XA.Build.Configuration) -m:1 -v:n + -p:RestoreConfigFile=NuGet.config displayName: prepare java.interop $(XA.Build.Configuration) continueOnError: false diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 8d9db7ce126..9b4793a7311 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -130,6 +130,7 @@ stages: project: Xamarin.Android.sln arguments: >- -t:PrepareJavaInterop -c Debug --no-restore + -p:RestoreConfigFile=NuGet.config -p:DotNetPreviewTool=$(System.DefaultWorkingDirectory)/bin/$(XA.Build.Configuration)/dotnet/dotnet displayName: prepare java.interop Debug continueOnError: false @@ -137,7 +138,9 @@ stages: - template: yaml-templates/run-dotnet-preview.yaml parameters: project: Xamarin.Android.sln - arguments: -t:PrepareJavaInterop -c $(XA.Build.Configuration) --no-restore + arguments: >- + -t:PrepareJavaInterop -c $(XA.Build.Configuration) --no-restore + -p:RestoreConfigFile=NuGet.config displayName: prepare java.interop $(XA.Build.Configuration) continueOnError: false From ecd90afe600570e73f2d55612d7b4c21d8ce163d Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 12:19:05 -0500 Subject: [PATCH 11/18] Revert "Pass `-p:RestoreConfigFile` more places" This reverts commit 4c2861e326d15b5d2712bb7db9b2207c2a9ab7fc. --- Makefile | 2 +- build-tools/automation/azure-pipelines-nightly.yaml | 4 +--- build-tools/automation/azure-pipelines.yaml | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b7e83467918..064b86f7005 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,7 @@ include build-tools/scripts/runtime-helpers.mk prepare: $(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS) $(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln - $(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop -p:RestoreConfigFile=NuGet.config + $(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop .PHONY: prepare-help prepare-help: diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index c11420f9531..a67b701fbb3 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -118,9 +118,7 @@ stages: - template: yaml-templates/run-dotnet-preview.yaml parameters: project: Xamarin.Android.sln - arguments: >- - -t:PrepareJavaInterop -c $(XA.Build.Configuration) -m:1 -v:n - -p:RestoreConfigFile=NuGet.config + arguments: -t:PrepareJavaInterop -c $(XA.Build.Configuration) -m:1 -v:n displayName: prepare java.interop $(XA.Build.Configuration) continueOnError: false diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 9b4793a7311..8d9db7ce126 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -130,7 +130,6 @@ stages: project: Xamarin.Android.sln arguments: >- -t:PrepareJavaInterop -c Debug --no-restore - -p:RestoreConfigFile=NuGet.config -p:DotNetPreviewTool=$(System.DefaultWorkingDirectory)/bin/$(XA.Build.Configuration)/dotnet/dotnet displayName: prepare java.interop Debug continueOnError: false @@ -138,9 +137,7 @@ stages: - template: yaml-templates/run-dotnet-preview.yaml parameters: project: Xamarin.Android.sln - arguments: >- - -t:PrepareJavaInterop -c $(XA.Build.Configuration) --no-restore - -p:RestoreConfigFile=NuGet.config + arguments: -t:PrepareJavaInterop -c $(XA.Build.Configuration) --no-restore displayName: prepare java.interop $(XA.Build.Configuration) continueOnError: false From 2c29c65fcb93a08075815e6571c770f620f979e5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 12:19:10 -0500 Subject: [PATCH 12/18] Revert "Pass `-p:RestoreConfigFile` to `Java.Interop.sln`" This reverts commit 1f8a122a07cdd51eb0b2d4194034f6fa05466877. --- 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 f875c3d3f1e689c64bc6beaa04901c26566b41d7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 12:19:33 -0500 Subject: [PATCH 13/18] Try `$(RestoreConfigFile)` in `*.override.props` --- external/Java.Interop.override.props | 1 + external/monodroid.override.props | 1 + 2 files changed, 2 insertions(+) diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props index 5242a70af3f..f270bdf188b 100644 --- a/external/Java.Interop.override.props +++ b/external/Java.Interop.override.props @@ -3,6 +3,7 @@ $(MSBuildThisFileDirectory)xamarin-android-tools True + $(MSBuildThisFileDirectory)..\NuGet.config diff --git a/external/monodroid.override.props b/external/monodroid.override.props index 8cbac6945cf..6cfa4d0ea18 100644 --- a/external/monodroid.override.props +++ b/external/monodroid.override.props @@ -2,6 +2,7 @@ $(MSBuildThisFileDirectory)xamarin-android-tools + $(MSBuildThisFileDirectory)..\NuGet.config From d3dc21d1cd6dd2a18d71257f12fa37e17e1d6fc6 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 13:13:47 -0500 Subject: [PATCH 14/18] $(RestoreAdditionalProjectSources) for the win? --- external/Java.Interop.override.props | 5 ++++- external/monodroid.override.props | 5 ++++- external/xamarin-android-tools.override.props | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 external/xamarin-android-tools.override.props diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props index f270bdf188b..e3acd4b73ed 100644 --- a/external/Java.Interop.override.props +++ b/external/Java.Interop.override.props @@ -3,7 +3,10 @@ $(MSBuildThisFileDirectory)xamarin-android-tools True - $(MSBuildThisFileDirectory)..\NuGet.config + + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json; + diff --git a/external/monodroid.override.props b/external/monodroid.override.props index 6cfa4d0ea18..9a7936119a0 100644 --- a/external/monodroid.override.props +++ b/external/monodroid.override.props @@ -2,7 +2,10 @@ $(MSBuildThisFileDirectory)xamarin-android-tools - $(MSBuildThisFileDirectory)..\NuGet.config + + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json; + diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props new file mode 100644 index 00000000000..837625dd3eb --- /dev/null +++ b/external/xamarin-android-tools.override.props @@ -0,0 +1,8 @@ + + + + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json; + + + From 01f4dc291e7a33a632b4698d773a17473244be56 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 14:20:21 -0500 Subject: [PATCH 15/18] $(RestoreAdditionalProjectSources) in one more place --- build-tools/scripts/DotNet.targets | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index 2c477fe1b55..6e9ee4da5a7 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -8,6 +8,11 @@ maui-android + + + <_RestoreAdditionalProjectSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json" /> + + From d34d4b0964fc584f7e2f4341be960c9ee40ac6b5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Aug 2023 16:23:03 -0500 Subject: [PATCH 16/18] DisableTransitiveFrameworkReferenceDownloads in tests --- .../Tests/Xamarin.ProjectTools/Common/XamarinProject.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs index 7ce6c520bfe..a3fe0d7a4c0 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs @@ -95,6 +95,7 @@ public XamarinProject (string debugConfigurationName = "Debug", string releaseCo $@" {Configuration} + true " }); From 4cab7e3305ddcb1856408e4e026801c765dcbca1 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 15:52:12 -0500 Subject: [PATCH 17/18] Update DotNet.targets --- build-tools/scripts/DotNet.targets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index 6e9ee4da5a7..fdea648ae1b 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -9,7 +9,8 @@ - + + <_RestoreAdditionalProjectSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json" /> <_RestoreAdditionalProjectSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json" /> @@ -22,7 +23,7 @@ From ff6ca305143ec707f1c954ea27bcd394190925ae Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 25 Sep 2023 16:36:49 -0500 Subject: [PATCH 18/18] Update DotNet.targets --- build-tools/scripts/DotNet.targets | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index fdea648ae1b..83b37c93f91 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -22,8 +22,17 @@ + + + <_Begin>\" + <_End>\" + + + <_Begin>'" + <_End>"' +