From d67523d43789bac24efa2739e82a58464601d2e9 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Tue, 28 Jun 2022 11:47:44 -0700 Subject: [PATCH 01/58] Set TrimMode to partial if not set Companion to https://github.com/dotnet/linker/pull/2856 --- dotnet/targets/Xamarin.Shared.Sdk.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props index b2abed3bc3d8..cfcdeefff5e1 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.props +++ b/dotnet/targets/Xamarin.Shared.Sdk.props @@ -16,6 +16,8 @@ <_XamarinTaskAssembly Condition="'$(_PlatformName)' != 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\iOS\Xamarin.iOS.Tasks.dll <_XamarinTaskAssembly Condition="'$(_PlatformName)' == 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\macOS\Xamarin.Mac.Tasks.dll true + + partial $(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.$(_PlatformName).Sdk.targets From a14002ad5349b89df427a080d12ca1cfe5c33f08 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Tue, 28 Jun 2022 12:10:01 -0700 Subject: [PATCH 02/58] Missed a few more places where _LinkMode was used --- dotnet/targets/Xamarin.Shared.Sdk.targets | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index ba6c710dd17a..f5d98c1992ed 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -389,8 +389,8 @@ copy - link - + partial + full <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --verbose @@ -429,14 +429,6 @@ - - - link - - From 6854d317019a10bf631c02a07eae6796b4c9623e Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 30 Jun 2022 22:44:10 -0700 Subject: [PATCH 03/58] Update DefaultAction call --- .../Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets index e274e8fd54c4..416db681199e 100644 --- a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets +++ b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets @@ -338,7 +338,7 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved. ReferenceAssemblyPaths="@(ReferencePath)" RootAssemblyNames="@(TrimmerRootAssembly)" TrimMode="$(TrimMode)" - DefaultAction="$(TrimmerDefaultAction)" + DefaultAction="$(_TrimmerDefaultAction)" RemoveSymbols="$(TrimmerRemoveSymbols)" FeatureSettings="@(_TrimmerFeatureSettings)" CustomData="@(_TrimmerCustomData)" From b8af230eaa3d0cd31550caf7e9c8a50f85a175d2 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Sun, 10 Jul 2022 19:46:37 -0700 Subject: [PATCH 04/58] Update Xamarin.Shared.Sdk.targets --- dotnet/targets/Xamarin.Shared.Sdk.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index fde839dad7d0..db9b0a568c40 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -515,7 +515,7 @@ copy partial full - <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data "LinkerOptionsFile=$(_CustomLinkerOptionsFile)" + <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data "LinkerOptionsFile=$(_CustomLinkerOptionsFile)" <_ExtraTrimmerArgs Condition="'$(TrimMode)' == 'copy' And '$(MarkCopiedAssemblies)' != 'true'">$(_ExtraTrimmerArgs) --custom-data DisableMarkingOfCopyAssemblies=true From 4c3cb2ed51dd31b374f6e8ab5c35fdc37cb0e125 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 12 Jul 2022 11:09:25 +0200 Subject: [PATCH 05/58] Fix whitespace --- dotnet/targets/Xamarin.Shared.Sdk.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index db9b0a568c40..99c257f66b03 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -515,7 +515,7 @@ copy partial full - <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data "LinkerOptionsFile=$(_CustomLinkerOptionsFile)" + <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data "LinkerOptionsFile=$(_CustomLinkerOptionsFile)" <_ExtraTrimmerArgs Condition="'$(TrimMode)' == 'copy' And '$(MarkCopiedAssemblies)' != 'true'">$(_ExtraTrimmerArgs) --custom-data DisableMarkingOfCopyAssemblies=true From 381ca5e2bc74b8dc93070d467378ff086a036992 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 12 Jul 2022 11:10:17 +0200 Subject: [PATCH 06/58] Simplify a bit. --- dotnet/targets/Xamarin.Shared.Sdk.targets | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index 99c257f66b03..dc45578fe364 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -452,8 +452,8 @@ $(TrimMode) copy - link - + partial + full - copy - partial - full <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --custom-data "LinkerOptionsFile=$(_CustomLinkerOptionsFile)" <_ExtraTrimmerArgs Condition="'$(TrimMode)' == 'copy' And '$(MarkCopiedAssemblies)' != 'true'">$(_ExtraTrimmerArgs) --custom-data DisableMarkingOfCopyAssemblies=true From 106983756e1456165e7ce0192eb9de4367503e75 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Wed, 13 Jul 2022 16:35:43 -0700 Subject: [PATCH 07/58] Update linker version --- 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 7bcc177cf391..5b45e7d90ed9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,9 +4,9 @@ https://github.com/dotnet/installer 1e2223659dbf25fc00f9119ad70629aae1f3d05f - + https://github.com/dotnet/linker - d794136809e207f9cfe02914af68b308106cc2c3 + e2b3a925b1ee6c55f9b95540647ce8362fe9ee44 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b663e3688b60..8c3fbab0c6b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 7.0.100-preview.6.22306.4 - 7.0.100-1.22273.1 + 7.0.100-1.22362.3 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 7.0.0-preview.6.22304.5 From 7fe9c6888618d97c1dece783022447adabdfa390 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 13:33:59 +0000 Subject: [PATCH 08/58] Update dependencies from https://github.com/dotnet/installer build 20220713.32 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22363.32 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22362.3 (parent: Microsoft.Dotnet.Sdk.Internal --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0bd6b7ab0a8d..9d4dc7cc0949 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fd38dc25ab1..3c756b9a84e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 691d82ff676ba35c1bb28ef94fbe7c9021481e1f + c00f057e6d2d6b036cc1657cf979280ddb8adefb - + https://github.com/dotnet/linker - 33a76b856466b96dd3d179e599a7fc0118389641 + e2b3a925b1ee6c55f9b95540647ce8362fe9ee44 - + https://github.com/dotnet/runtime - 1967649721058a457157d4321af3e6fceaa5441b + 07fce444414871ccbaa133f170449adf5eb5e591 - + https://github.com/dotnet/aspnetcore - 69c7a87cd8f05da9c05c373edfc0337c9e864d9e + bf3352f2422bf16fa3ca49021f0e31961ce525eb diff --git a/eng/Versions.props b/eng/Versions.props index 5716bc04184e..7217f35c3598 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22363.4 - 7.0.100-1.22362.1 + 7.0.100-rc.1.22363.32 + 7.0.100-1.22362.3 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-preview.7.22358.7 + 7.0.0-preview.7.22362.3 7.0.100-alpha.1.21601.1 From 74610c10fc1e8f5fc6bdf1c4c12b3fa123de1f9c Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 14 Jul 2022 13:34:51 +0000 Subject: [PATCH 09/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index bf0231a31ada..83539e9c8ed8 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22363.4" + "version": "7.0.100-rc.1.22363.32" } } From eb8afbac67f787d11bda14c24ea83009953082ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Jul 2022 08:36:31 +0000 Subject: [PATCH 10/58] Update dependencies from https://github.com/dotnet/installer build 20220714.28 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22364.28 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22362.3 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c756b9a84e3..10bde371c0c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - c00f057e6d2d6b036cc1657cf979280ddb8adefb + b8ff00a4eee349bfb7a071e91c6f385f41a0f432 https://github.com/dotnet/linker e2b3a925b1ee6c55f9b95540647ce8362fe9ee44 - + https://github.com/dotnet/runtime - 07fce444414871ccbaa133f170449adf5eb5e591 + b7fca07f478739d9fd50bdf5d1467c02dc05b6b0 - + https://github.com/dotnet/aspnetcore - bf3352f2422bf16fa3ca49021f0e31961ce525eb + ac67d32b92520edb35139645074c704cc2605fbd diff --git a/eng/Versions.props b/eng/Versions.props index 7217f35c3598..8836039dc745 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22363.32 + 7.0.100-rc.1.22364.28 7.0.100-1.22362.3 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-preview.7.22362.3 + 7.0.0-preview.7.22362.12 7.0.100-alpha.1.21601.1 From 18e5f9063b237b46ef95040f706adf48885307d5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 15 Jul 2022 08:37:21 +0000 Subject: [PATCH 11/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 83539e9c8ed8..a43b5d4c6381 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22363.32" + "version": "7.0.100-rc.1.22364.28" } } From 621fc546a9d9ff01e7ec0e1ff5ccf6d97c060980 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Jul 2022 19:12:24 +0200 Subject: [PATCH 12/58] Fix linking nothing. --- dotnet/targets/Xamarin.Shared.Sdk.targets | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index 9c1cae336311..a0df14724028 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -451,9 +451,10 @@ $(TrimMode) - copy + copy partial full + + + copy + + From 8282bd6a1a28bca4b858f961208e4f9257a01f2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Jul 2022 12:58:07 +0000 Subject: [PATCH 13/58] Update dependencies from https://github.com/dotnet/installer build 20220715.7 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22365.7 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22364.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10bde371c0c4..977341f5cd24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - b8ff00a4eee349bfb7a071e91c6f385f41a0f432 + 43f10a2ade067443ca542711727266fae4741762 - + https://github.com/dotnet/linker - e2b3a925b1ee6c55f9b95540647ce8362fe9ee44 + 072ebe7c115e80bf2555bb5f02049379e6bf9722 https://github.com/dotnet/runtime b7fca07f478739d9fd50bdf5d1467c02dc05b6b0 - + https://github.com/dotnet/aspnetcore - ac67d32b92520edb35139645074c704cc2605fbd + aceefcdf7061d87ff91e4ebd765ddee9b3d9b1a4 diff --git a/eng/Versions.props b/eng/Versions.props index 8836039dc745..b488c1824ec3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,8 @@ - 7.0.100-rc.1.22364.28 - 7.0.100-1.22362.3 + 7.0.100-rc.1.22365.7 + 7.0.100-1.22364.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 7.0.0-preview.7.22362.12 From fff15a589250342e4244a339f6a55cd85f595c9c Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 16 Jul 2022 12:58:54 +0000 Subject: [PATCH 14/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index a43b5d4c6381..0d7ab5d04a43 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22364.28" + "version": "7.0.100-rc.1.22365.7" } } From 6b6d7ff91d43dfadf3281132f398994384fa5cef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Jul 2022 13:08:08 +0000 Subject: [PATCH 15/58] Update dependencies from https://github.com/dotnet/installer build 20220718.2 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22368.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22365.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 977341f5cd24..4ba712f97331 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 43f10a2ade067443ca542711727266fae4741762 + a9c056cd39d431a1b419f24de6d22d2ff24da7c1 - + https://github.com/dotnet/linker - 072ebe7c115e80bf2555bb5f02049379e6bf9722 + d27ff61b711aa685006d6d55057faf01b482114f - + https://github.com/dotnet/runtime - b7fca07f478739d9fd50bdf5d1467c02dc05b6b0 + 072eda8d6b2c24ba4c7691a780546a2d6691b1a4 - + https://github.com/dotnet/aspnetcore - aceefcdf7061d87ff91e4ebd765ddee9b3d9b1a4 + 06a1f45f79c300c732b0171ce6318a130d05a083 diff --git a/eng/Versions.props b/eng/Versions.props index b488c1824ec3..db65a12458d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22365.7 - 7.0.100-1.22364.1 + 7.0.100-rc.1.22368.2 + 7.0.100-1.22365.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-preview.7.22362.12 + 7.0.0-rc.1.22366.5 7.0.100-alpha.1.21601.1 From cb4b77cc4562feb727197287293b686b391259d7 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 18 Jul 2022 13:09:01 +0000 Subject: [PATCH 16/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 0d7ab5d04a43..599de435877d 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22365.7" + "version": "7.0.100-rc.1.22368.2" } } From 70ecfaeb547d761ac48ff40a763354d0bfe2d2e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Jul 2022 13:24:19 +0000 Subject: [PATCH 17/58] Update dependencies from https://github.com/dotnet/installer build 20220718.24 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22368.24 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ba712f97331..9c47aa49050e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - a9c056cd39d431a1b419f24de6d22d2ff24da7c1 + bd5932799a8d6436b2bd8157a9484aedca5b7cc3 - + https://github.com/dotnet/linker - d27ff61b711aa685006d6d55057faf01b482114f + 31a57b5762d8aceb4a61cc1e6cf96605cce417f1 - + https://github.com/dotnet/runtime - 072eda8d6b2c24ba4c7691a780546a2d6691b1a4 + aafa91036e1efd3d4dcb67eeb261cb6d8f774685 - + https://github.com/dotnet/aspnetcore - 06a1f45f79c300c732b0171ce6318a130d05a083 + 8537d21033f92d6521adf5ce4350d052f48f4185 diff --git a/eng/Versions.props b/eng/Versions.props index db65a12458d6..7cf6f09d2614 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22368.2 - 7.0.100-1.22365.1 + 7.0.100-rc.1.22368.24 + 7.0.100-1.22368.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22366.5 + 7.0.0-rc.1.22367.4 7.0.100-alpha.1.21601.1 From 8f93b55ef3b8f6977aac770a7883d27a30779e6c Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 19 Jul 2022 13:25:08 +0000 Subject: [PATCH 18/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 599de435877d..8fee5876359d 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22368.2" + "version": "7.0.100-rc.1.22368.24" } } From 37c9c5e1921f0815c91d6357362227cde0de3985 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Jul 2022 13:28:23 +0000 Subject: [PATCH 19/58] Update dependencies from https://github.com/dotnet/installer build 20220719.6 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22369.6 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (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 9c47aa49050e..7f1cef3aa8e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - bd5932799a8d6436b2bd8157a9484aedca5b7cc3 + 671260b0929b6c249225b3028abd8aed27a536fd https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 7cf6f09d2614..1876af850415 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22368.24 + 7.0.100-rc.1.22369.6 7.0.100-1.22368.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From da1579cba3a73c7b041f3f4179ba86b44d69c1d4 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 20 Jul 2022 13:29:24 +0000 Subject: [PATCH 20/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 8fee5876359d..df074c187653 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22368.24" + "version": "7.0.100-rc.1.22369.6" } } From 473625230d3f6463874c61dd073414c5d5a3c492 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Jul 2022 13:26:38 +0000 Subject: [PATCH 21/58] Update dependencies from https://github.com/dotnet/installer build 20220720.12 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22370.12 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (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 7f1cef3aa8e6..bc0489319300 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 671260b0929b6c249225b3028abd8aed27a536fd + e4d35dc39d8a302bbc0bca1b2a9c321eaa413418 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 1876af850415..9332ac0434d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22369.6 + 7.0.100-rc.1.22370.12 7.0.100-1.22368.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From 4454f705ed28f83a3de5e01f2d6d6ffa95af4ff5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 21 Jul 2022 13:27:30 +0000 Subject: [PATCH 22/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index df074c187653..a4e38aff3a65 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22369.6" + "version": "7.0.100-rc.1.22370.12" } } From c4977a9ac01cc79472ed4410cf7c979c8268ff77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Jul 2022 13:35:02 +0000 Subject: [PATCH 23/58] Update dependencies from https://github.com/dotnet/installer build 20220721.5 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22371.5 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (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 bc0489319300..205468d94d62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - e4d35dc39d8a302bbc0bca1b2a9c321eaa413418 + b2beceb5c62113a5600855d9665ac7f7c683cd15 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 9332ac0434d5..6f7c8e335fd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22370.12 + 7.0.100-rc.1.22371.5 7.0.100-1.22368.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From 363b36f315bc0a36c4b65e2a2f74acaeff34a7bd Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 22 Jul 2022 13:35:55 +0000 Subject: [PATCH 24/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index a4e38aff3a65..e49b2f1076c4 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22370.12" + "version": "7.0.100-rc.1.22371.5" } } From 85d5e7edb2ebd6a931722679bab1705b48224983 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Jul 2022 13:17:35 +0000 Subject: [PATCH 25/58] Update dependencies from https://github.com/dotnet/installer build 20220722.3 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22372.3 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (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 205468d94d62..08dafe89c080 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - b2beceb5c62113a5600855d9665ac7f7c683cd15 + ace7452f3bc6801cf4c4b5745b777c60e9e496a7 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 6f7c8e335fd4..c25cf1b1514d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22371.5 + 7.0.100-rc.1.22372.3 7.0.100-1.22368.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From e4f9b581dc13ebfa7e1c0c27946a0bbb34c90316 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 23 Jul 2022 13:18:21 +0000 Subject: [PATCH 26/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index e49b2f1076c4..44435185ec31 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22371.5" + "version": "7.0.100-rc.1.22372.3" } } From 86d4995eedb2ce849d5bf6a8fe923598e15c4f7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Jul 2022 12:56:14 +0000 Subject: [PATCH 27/58] Update dependencies from https://github.com/dotnet/installer build 20220724.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22374.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (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 08dafe89c080..ea7a01a9494b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - ace7452f3bc6801cf4c4b5745b777c60e9e496a7 + 53587f98e132f3c5bc6d2a77d779d6872710d53e https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index c25cf1b1514d..368c3f5ebf34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22372.3 + 7.0.100-rc.1.22374.1 7.0.100-1.22368.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From ccbb4c7ad721b8c58c735335f0a10dd71686a7df Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 25 Jul 2022 12:57:10 +0000 Subject: [PATCH 28/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 44435185ec31..eee3c633b6bf 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22372.3" + "version": "7.0.100-rc.1.22374.1" } } From 0447bec0fa93b3d696c9b8ae8d6685c33fb4cf76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Jul 2022 13:31:00 +0000 Subject: [PATCH 29/58] Update dependencies from https://github.com/dotnet/installer build 20220725.3 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22375.3 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (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 ea7a01a9494b..29da35fd9315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 53587f98e132f3c5bc6d2a77d779d6872710d53e + e7f755308e99955dfa2c3104ef04be07c4d8dd8d https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 368c3f5ebf34..6656c2f21196 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22374.1 + 7.0.100-rc.1.22375.3 7.0.100-1.22368.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From 30fd7ffa54ac0ddd5058845d84d4e8fdb9a2ce41 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 26 Jul 2022 13:31:52 +0000 Subject: [PATCH 30/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index eee3c633b6bf..5dd3b876e659 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22374.1" + "version": "7.0.100-rc.1.22375.3" } } From 09f28973e0c359e7793d892770082d31b86448f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Jul 2022 13:20:19 +0000 Subject: [PATCH 31/58] Update dependencies from https://github.com/dotnet/installer build 20220726.4 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22376.4 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22368.1 (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 29da35fd9315..52ac79d65cb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - e7f755308e99955dfa2c3104ef04be07c4d8dd8d + 46786fe77759d7f58cffef1ec2f71d5be5e11f31 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 6656c2f21196..ac8b9327c37f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22375.3 + 7.0.100-rc.1.22376.4 7.0.100-1.22368.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From 4cce2f4168224e01030f4f9e21a93c65565344b9 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 27 Jul 2022 13:21:06 +0000 Subject: [PATCH 32/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 5dd3b876e659..3eab51940262 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22375.3" + "version": "7.0.100-rc.1.22376.4" } } From 8cde5ad603fe5ac0f04ceae85c724f209858d3d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Jul 2022 13:23:41 +0000 Subject: [PATCH 33/58] Update dependencies from https://github.com/dotnet/installer build 20220728.2 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22378.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22377.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52ac79d65cb6..1fef16c3b8e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 46786fe77759d7f58cffef1ec2f71d5be5e11f31 + 5ce6077bf38c7f21c6a1215e4de8d0c39cd03d6b - + https://github.com/dotnet/linker - 31a57b5762d8aceb4a61cc1e6cf96605cce417f1 + f09bacf09ef10b61cf9f19825f8782171a816dab - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/aspnetcore - 8537d21033f92d6521adf5ce4350d052f48f4185 + 64744fd4c1a1b72eed6bed80153285253b71db34 diff --git a/eng/Versions.props b/eng/Versions.props index ac8b9327c37f..b1eb1bdd90ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22376.4 - 7.0.100-1.22368.1 + 7.0.100-rc.1.22378.2 + 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22367.4 + 7.0.0-rc.1.22376.8 7.0.100-alpha.1.21601.1 From 8c3afbf5eb7359c73aaa85201d395a40df007b48 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Jul 2022 13:24:30 +0000 Subject: [PATCH 34/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 3eab51940262..8ccd56f6c7fb 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22376.4" + "version": "7.0.100-rc.1.22378.2" } } From 340924a409fc58ae84814e35369b2b2c8147b259 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Jul 2022 13:12:58 +0000 Subject: [PATCH 35/58] Update dependencies from https://github.com/dotnet/installer build 20220729.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22379.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22377.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fef16c3b8e3..7ced853f6700 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 5ce6077bf38c7f21c6a1215e4de8d0c39cd03d6b + 280f75e7174ea671c70ec0eddfb8a9474d54edc4 https://github.com/dotnet/linker f09bacf09ef10b61cf9f19825f8782171a816dab - + https://github.com/dotnet/runtime - 2c31641b96d880dfb74d46fe63a91c8b35737cab + 97749c034e3a94c03c2ebfef94fa6aa4b257488b - + https://github.com/dotnet/aspnetcore - 64744fd4c1a1b72eed6bed80153285253b71db34 + 094f76134db49eebe9ba46212196305d86874813 diff --git a/eng/Versions.props b/eng/Versions.props index b1eb1bdd90ab..ad02322a4051 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22378.2 + 7.0.100-rc.1.22379.1 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22378.2 7.0.100-alpha.1.21601.1 From 77218226dc99010eff4bab6c708749857d066825 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 29 Jul 2022 13:13:47 +0000 Subject: [PATCH 36/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 8ccd56f6c7fb..d07b8edebaf4 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22378.2" + "version": "7.0.100-rc.1.22379.1" } } From fa113ff27046b6518e657047a96d74a1c1340619 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Jul 2022 13:14:41 +0000 Subject: [PATCH 37/58] Update dependencies from https://github.com/dotnet/installer build 20220729.5 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22379.5 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22377.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ced853f6700..3af7ef997816 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 280f75e7174ea671c70ec0eddfb8a9474d54edc4 + c674772706ce0292a7d2ef3f34c9979867304412 https://github.com/dotnet/linker @@ -13,9 +13,9 @@ 97749c034e3a94c03c2ebfef94fa6aa4b257488b - + https://github.com/dotnet/aspnetcore - 094f76134db49eebe9ba46212196305d86874813 + 19dcc4cfe1ac43f5d20d7f2c0a6655f0000be59a diff --git a/eng/Versions.props b/eng/Versions.props index ad02322a4051..3205586a217c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22379.1 + 7.0.100-rc.1.22379.5 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From 557494988026cd8e64fc452273ade1200597f16b Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 30 Jul 2022 13:15:25 +0000 Subject: [PATCH 38/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index d07b8edebaf4..492cd3a50ab8 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22379.1" + "version": "7.0.100-rc.1.22379.5" } } From adf684ff499fa5e2cab255c39907bb954bbacbad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Aug 2022 13:07:00 +0000 Subject: [PATCH 39/58] Update dependencies from https://github.com/dotnet/installer build 20220731.2 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22381.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22377.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3af7ef997816..3ed5567fdde6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - c674772706ce0292a7d2ef3f34c9979867304412 + 87ecb788b68cf14d0ebf1b89365ebfa8ca6f8c96 https://github.com/dotnet/linker f09bacf09ef10b61cf9f19825f8782171a816dab - + https://github.com/dotnet/runtime - 97749c034e3a94c03c2ebfef94fa6aa4b257488b + 17a4eca42337109c4f916a023d97df12b50b5d59 - + https://github.com/dotnet/aspnetcore - 19dcc4cfe1ac43f5d20d7f2c0a6655f0000be59a + a85675d5da8e42909f0ece7e70df9af35615707d diff --git a/eng/Versions.props b/eng/Versions.props index 3205586a217c..21636972b66e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22379.5 + 7.0.100-rc.1.22381.2 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22378.2 + 7.0.0-rc.1.22380.3 7.0.100-alpha.1.21601.1 From a9cc7ff7469aa65dffa9fd13164cf2cb77b83eeb Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 1 Aug 2022 13:07:49 +0000 Subject: [PATCH 40/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 492cd3a50ab8..7b1f1bdede06 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22379.5" + "version": "7.0.100-rc.1.22381.2" } } From 81d3e561911adb5a27cf229b0c82689d751d8116 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Aug 2022 13:19:33 +0000 Subject: [PATCH 41/58] Update dependencies from https://github.com/dotnet/installer build 20220802.2 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22402.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22377.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ed5567fdde6..a7bc0cd7861d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 87ecb788b68cf14d0ebf1b89365ebfa8ca6f8c96 + 28835d561e81a206d3ae91d1c44836dc784e265b https://github.com/dotnet/linker f09bacf09ef10b61cf9f19825f8782171a816dab - + https://github.com/dotnet/runtime - 17a4eca42337109c4f916a023d97df12b50b5d59 + 508fef51e841aa16ffed1aae32bf4793a2cea363 - + https://github.com/dotnet/aspnetcore - a85675d5da8e42909f0ece7e70df9af35615707d + b7b37d1e9d47919c27f1895c3428e3da6ddf86b8 diff --git a/eng/Versions.props b/eng/Versions.props index 21636972b66e..1444523edc75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22381.2 + 7.0.100-rc.1.22402.2 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22380.3 + 7.0.0-rc.1.22381.5 7.0.100-alpha.1.21601.1 From bba5246b79e1ac4c32a50d52f3869b0f77073159 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 2 Aug 2022 13:20:29 +0000 Subject: [PATCH 42/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 7b1f1bdede06..4487145a5895 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22381.2" + "version": "7.0.100-rc.1.22402.2" } } From bef4fc03a8bfc2163b5a49d43a0762f2fc2b3523 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Aug 2022 13:17:43 +0000 Subject: [PATCH 43/58] Update dependencies from https://github.com/dotnet/installer build 20220803.4 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22403.4 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22377.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7bc0cd7861d..e14063655ce3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 28835d561e81a206d3ae91d1c44836dc784e265b + 6996a553a673fcac7a721fa00fdcc8ecfed35315 https://github.com/dotnet/linker f09bacf09ef10b61cf9f19825f8782171a816dab - + https://github.com/dotnet/runtime - 508fef51e841aa16ffed1aae32bf4793a2cea363 + aac729ff906a31f327823587748687c0308a4043 - + https://github.com/dotnet/aspnetcore - b7b37d1e9d47919c27f1895c3428e3da6ddf86b8 + a57d5c4d40734d19fb7eac8b6fa6529f70fc2b33 diff --git a/eng/Versions.props b/eng/Versions.props index 1444523edc75..069b556a8f2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22402.2 + 7.0.100-rc.1.22403.4 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22381.5 + 7.0.0-rc.1.22401.9 7.0.100-alpha.1.21601.1 From df5a08811472410718987f70dbf3e8ec927aa987 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 3 Aug 2022 13:18:49 +0000 Subject: [PATCH 44/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 4487145a5895..7bbdce99dd10 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22402.2" + "version": "7.0.100-rc.1.22403.4" } } From cb9dc4b9f402ccfdeabd96d2ae2d0ed1157b4383 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Aug 2022 13:28:28 +0000 Subject: [PATCH 45/58] Update dependencies from https://github.com/dotnet/installer build 20220803.8 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22363.4 -> To Version 7.0.100-rc.1.22403.8 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22362.1 -> To Version 7.0.100-1.22377.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e14063655ce3..4200c7908c44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 6996a553a673fcac7a721fa00fdcc8ecfed35315 + 3854e285abc309ba66107a28709254fb1d187145 https://github.com/dotnet/linker f09bacf09ef10b61cf9f19825f8782171a816dab - + https://github.com/dotnet/runtime - aac729ff906a31f327823587748687c0308a4043 + a6c0d5c483273725a3626ddbbb355464f3753f09 - + https://github.com/dotnet/aspnetcore - a57d5c4d40734d19fb7eac8b6fa6529f70fc2b33 + 846f0fd3cc4217582c00da10ad590704288190af diff --git a/eng/Versions.props b/eng/Versions.props index 069b556a8f2e..6f230a6b7882 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22403.4 + 7.0.100-rc.1.22403.8 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22401.9 + 7.0.0-rc.1.22402.10 7.0.100-alpha.1.21601.1 From 4ceb89973200f4a93728ccb6d5e18ba7e075fe36 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 4 Aug 2022 13:29:20 +0000 Subject: [PATCH 46/58] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 7bbdce99dd10..7935fab453ed 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22403.4" + "version": "7.0.100-rc.1.22403.8" } } From 96a2e8e8442b76d94649ca09fde349207c384d50 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Tue, 19 Jul 2022 18:24:18 -0400 Subject: [PATCH 47/58] [CI] Remove older pkgs in the system to make sure we are not running the tests with an older version. (#15545) --- tools/devops/automation/templates/tests/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/devops/automation/templates/tests/build.yml b/tools/devops/automation/templates/tests/build.yml index 9561805cf31c..f67c5fd485c3 100644 --- a/tools/devops/automation/templates/tests/build.yml +++ b/tools/devops/automation/templates/tests/build.yml @@ -63,6 +63,11 @@ steps: parameters: keyringPass: ${{ parameters.keyringPass }} +- bash: | + rm -Rf /Library/Frameworks/Xamarin.Mac.framework + rm -Rf /Library/Frameworks/Xamarin.iOS.framework + displayName: 'Remove older Frameworks' + # Use a cmdlet to check if the space available in the devices root system is larger than 50 gb. If there is not # enough space available it: # 1. Set the status of the build to error. It is not a failure since no tests have been ran. From de1142514b59d2704d9a526f0c18ebab6264164e Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Wed, 20 Jul 2022 08:26:01 -0400 Subject: [PATCH 48/58] [Xtro] Ensure that when we do auto sanitize we do not return a fail. (#15551) When working on the bindings we can use the "AUTO_SANITIZE" env var to let xtro know that we want the lines that have been fixed to be removed, unfortunatly this mode has a bug. When we autosanitized we should do the same as the skip and not return the lines that have been cleaned as the return code. Returning the error code meant that when we did make all, the first target (classic) would work, but the second target would not because the first one failed. Doing this allows to work on the bindings and have AUTO_SANITIZE work both for classic and dotnet when doing make all. --- tests/xtro-sharpie/xtro-sanity/Sanitizer.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/xtro-sharpie/xtro-sanity/Sanitizer.cs b/tests/xtro-sharpie/xtro-sanity/Sanitizer.cs index 20672885dc6a..cdb3824741fa 100644 --- a/tests/xtro-sharpie/xtro-sanity/Sanitizer.cs +++ b/tests/xtro-sharpie/xtro-sanity/Sanitizer.cs @@ -302,7 +302,10 @@ public static int Main (string [] args) Console.WriteLine ($"Sanity check failed ({count})"); // useful when updating stuff locally - we report but we don't fail - return Environment.GetEnvironmentVariable ("XTRO_SANITY_SKIP") == "1" ? 0 : count; + var sanitizedOrSkippedSanity = + !string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("XTRO_SANITY_SKIP")) + || !string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("AUTO_SANITIZE")); + return sanitizedOrSkippedSanity ? 0 : count; } } } From 48bbba41173ca0ace0f570f53a341e1c739095d7 Mon Sep 17 00:00:00 2001 From: Emanuel Fernandez Dell'Oca Date: Wed, 20 Jul 2022 11:25:51 -0400 Subject: [PATCH 49/58] Bump Xamarin.Messaging to 1.6.60 (#15370) * Bump Xamarin.Messaging to 1.6.60 * Bump GitInfo to match Xamarin.Messaging Co-authored-by: Alex Soto --- msbuild/Directory.Build.props | 2 +- .../Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/msbuild/Directory.Build.props b/msbuild/Directory.Build.props index 6ea13fb15abc..3264dbb3a182 100644 --- a/msbuild/Directory.Build.props +++ b/msbuild/Directory.Build.props @@ -1,6 +1,6 @@ - 1.6.24 + 1.6.60 1.0.93 diff --git a/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj b/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj index b1403d6ab891..89813f5f4a43 100644 --- a/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj +++ b/msbuild/Messaging/Xamarin.Messaging.Build/Xamarin.Messaging.Build.csproj @@ -12,7 +12,7 @@ - + From 6b97574a0e33467868b6bb592ca3fadbe130039c Mon Sep 17 00:00:00 2001 From: Emanuel Fernandez Dell'Oca Date: Thu, 21 Jul 2022 16:17:20 -0400 Subject: [PATCH 50/58] Ensure the Hot Restart bundle does not have any entitlements set (#15558) Hot Restart expects the archived-expanded-entitlements.xcent to be empty. If any entitlements are added to that file, the new app signature will be invalid. These changes ensure that file will be an empty plist when extracting the PreBuilt app. Partial fix for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1550700 --- msbuild/Xamarin.iOS.Tasks.Windows/Tasks/PrepareAppBundle.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Tasks/PrepareAppBundle.cs b/msbuild/Xamarin.iOS.Tasks.Windows/Tasks/PrepareAppBundle.cs index 25013df8fa09..b5201e932d1f 100644 --- a/msbuild/Xamarin.iOS.Tasks.Windows/Tasks/PrepareAppBundle.cs +++ b/msbuild/Xamarin.iOS.Tasks.Windows/Tasks/PrepareAppBundle.cs @@ -3,6 +3,7 @@ using System.IO; using System.IO.Compression; using Xamarin.iOS.Windows; +using Xamarin.MacDev; namespace Xamarin.iOS.HotRestart.Tasks { public class PrepareAppBundle : Task { @@ -36,6 +37,10 @@ public override bool Execute () "Xamarin.PreBuilt.iOS.app.zip"); ZipFile.ExtractToDirectory (preBuiltAppBundlePath, AppBundlePath); + + // Ensure the archived-expanded-entitlements.xcent is empty. If there are any entitlements in that file, the new signature will be invalid + new PDictionary ().Save (Path.Combine (AppBundlePath, "archived-expanded-entitlements.xcent")); + File.WriteAllText (Path.Combine (AppBundlePath, "Extracted"), string.Empty); } From c40a84c4ec3847b13315158d22504f7339500ad2 Mon Sep 17 00:00:00 2001 From: Mauro Agnoletti Date: Mon, 25 Jul 2022 20:53:25 -0400 Subject: [PATCH 51/58] Set custom home env var from XMA Build Agent (#15571) Overriding HOME is dangerous because it could cause unwanted side effects, like breaking the keychain API logic. For this reason, we need to use a custom environment variable to store the custom home used by the XMA dotnet SDK. This custom home should be passed everywhere as environment settings when we invoke the dotnet tool --- .../Messaging/Xamarin.Messaging.Build/TaskRunner.cs | 2 +- .../Tasks/BTouchTaskBase.cs | 8 +++++++- .../ComputeRemoteGeneratorPropertiesTaskBase.cs | 12 ++++++++++-- .../Tasks/FindAotCompilerTaskBase.cs | 9 ++++++++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs b/msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs index c69572e9e3b7..33cfc025d349 100644 --- a/msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs +++ b/msbuild/Messaging/Xamarin.Messaging.Build/TaskRunner.cs @@ -21,7 +21,7 @@ internal TaskRunner (ITaskSerializer serializer) var dotnetPath = Path.Combine (sdkRootPath, "dotnet", "dotnet"); if (File.Exists (dotnetPath)) { - Environment.SetEnvironmentVariable ("HOME", Path.Combine (sdkRootPath, ".home")); + Environment.SetEnvironmentVariable ("DOTNET_CUSTOM_HOME", Path.Combine (sdkRootPath, ".home")); } else { //In case the XMA dotnet has not been installed yet dotnetPath = "/usr/local/share/dotnet/dotnet"; diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/BTouchTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/BTouchTaskBase.cs index 372ed2f4620d..e9cb3f1d7614 100644 --- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/BTouchTaskBase.cs +++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/BTouchTaskBase.cs @@ -268,7 +268,13 @@ public override bool Execute () BTouchToolPath = PathUtils.ConvertToMacPath (BTouchToolPath); DotNetCscCompiler = PathUtils.ConvertToMacPath (DotNetCscCompiler); - if (!IsDotNet) { + if (IsDotNet) { + var customHome = Environment.GetEnvironmentVariable ("DOTNET_CUSTOM_HOME"); + + if(!string.IsNullOrEmpty(customHome)) { + EnvironmentVariables = EnvironmentVariables.CopyAndAdd ($"HOME={customHome}"); + } + } else { ToolExe = BTouchToolExe; ToolPath = BTouchToolPath; } diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ComputeRemoteGeneratorPropertiesTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ComputeRemoteGeneratorPropertiesTaskBase.cs index 2d80bb1f5f39..cb6e24a6582b 100644 --- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ComputeRemoteGeneratorPropertiesTaskBase.cs +++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ComputeRemoteGeneratorPropertiesTaskBase.cs @@ -90,11 +90,19 @@ void ComputeProperties () File.WriteAllText (projectPath, csproj); var arguments = new List (); - if (IsDotNet) { + var environment = default (Dictionary); + + if (IsDotNet) { executable = Environment.GetEnvironmentVariable ("DOTNET_HOST_PATH"); if (string.IsNullOrEmpty (executable)) executable = "dotnet"; arguments.Add ("build"); + + var customHome = Environment.GetEnvironmentVariable ("DOTNET_CUSTOM_HOME"); + + if (!string.IsNullOrEmpty (customHome)) { + environment = new Dictionary { { "HOME", customHome } }; + } } else { executable = "/Library/Frameworks/Mono.framework/Commands/msbuild"; } @@ -108,7 +116,7 @@ void ComputeProperties () arguments.Add (projectPath); - ExecuteAsync (executable, arguments).Wait (); + ExecuteAsync (executable, arguments, environment: environment).Wait (); var computedPropertes = File.ReadAllLines (outputFile); foreach (var line in computedPropertes) { var property = line.Substring (0, line.IndexOf ('=')); diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/FindAotCompilerTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/FindAotCompilerTaskBase.cs index 73f7e8242408..a58dda6a688f 100644 --- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/FindAotCompilerTaskBase.cs +++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/FindAotCompilerTaskBase.cs @@ -74,8 +74,15 @@ string ComputeAotCompilerPath () arguments.Add ("/t:ComputeAotCompilerPath"); arguments.Add (projectPath); + var environment = default (Dictionary); + var customHome = Environment.GetEnvironmentVariable ("DOTNET_CUSTOM_HOME"); + + if (!string.IsNullOrEmpty (customHome)) { + environment = new Dictionary { { "HOME", customHome } }; + } + try { - ExecuteAsync (executable, arguments).Wait (); + ExecuteAsync (executable, arguments, environment: environment).Wait (); return File.ReadAllText (outputFile).Trim (); } finally { File.Delete (projectPath); From 1bc7f36aa9f0d82b20c2fb483d2655e3f2c433dc Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 25 Jul 2022 17:08:42 -0500 Subject: [PATCH 52/58] [mlaunch] Fix permisisons after extracting from nuget (#15566) * [mlaunch] Fix permisisons after extracting from nuget - A side effect of https://github.com/xamarin/xamarin-macios/commit/ac1fa258168e16b6ece16f510135ebdf0d23b1ee is that the permission of bin/mlaunch is no longer +x for non-root, which means it is unusable. * Apply suggestions from code review Co-authored-by: Manuel de la Pena * Apply fix to app bundle mlaunch as well Co-authored-by: Manuel de la Pena --- tools/mlaunch/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/mlaunch/Makefile b/tools/mlaunch/Makefile index 4e2e79ea6f78..aaa4aa5a1454 100644 --- a/tools/mlaunch/Makefile +++ b/tools/mlaunch/Makefile @@ -26,6 +26,8 @@ $(IOS_DESTDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mla $(Q) mkdir -p $(IOS_DESTDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/ $(Q) $(CP) -R $(TOP)/packages/microsoft.tools.mlaunch/$(MLAUNCH_NUGET_VERSION)/mlaunch/bin/mlaunch $(IOS_DESTDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/ $(Q) $(CP) -R $(TOP)/packages/microsoft.tools.mlaunch/$(MLAUNCH_NUGET_VERSION)/mlaunch/lib/mlaunch $(IOS_DESTDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/ + $(Q) chmod a+x $(IOS_DESTDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mlaunch + $(Q) chmod a+x $(IOS_DESTDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mlaunch/mlaunch.app/Contents/MacOS/mlaunch define DotNetInstall $$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/tools/bin/mlaunch: $$(DOWNLOAD_STAMP_FILE) @@ -35,6 +37,8 @@ $$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/tools/bin/mlaunch: $$(DOWNLOAD_STAMP_FILE) $$(Q) mkdir -p $$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/tools/lib $$(Q) $$(CP) -R $(TOP)/packages/microsoft.tools.mlaunch/$$(MLAUNCH_NUGET_VERSION)/mlaunch/bin/mlaunch $$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/tools/bin/mlaunch $$(Q) $$(CP) -R $(TOP)/packages/microsoft.tools.mlaunch/$$(MLAUNCH_NUGET_VERSION)/mlaunch/lib/mlaunch $$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/tools/lib + $$(Q) chmod a+x $$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/tools/bin/mlaunch + $$(Q) chmod a+x $$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/tools/lib/mlaunch/mlaunch.app/Contents/MacOS/mlaunch endef $(foreach platform,$(DOTNET_PLATFORMS_MOBILE),$(eval $(call DotNetInstall,$(platform)))) From d4ee04d5eb74035d5f838fa55c04ea92f1b856e7 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Wed, 3 Aug 2022 10:25:20 -0400 Subject: [PATCH 53/58] [CI] List the installed frameworks in the test bot. (#15611) --- tools/devops/automation/templates/common/setup.yml | 1 + tools/devops/automation/templates/tests/build.yml | 10 +++++----- tools/devops/automation/templates/tests/run-tests.yml | 6 +++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/devops/automation/templates/common/setup.yml b/tools/devops/automation/templates/common/setup.yml index a3bc6b60a7ce..788f937208bf 100644 --- a/tools/devops/automation/templates/common/setup.yml +++ b/tools/devops/automation/templates/common/setup.yml @@ -49,6 +49,7 @@ steps: sudo rm -Rf /Developer/MonoTouch sudo rm -Rf /Library/Frameworks/Xamarin.iOS.framework sudo rm -Rf /Library/Frameworks/Xamarin.Mac.framework + ls -R /Library/Frameworks displayName: 'Delete library folders' timeoutInMinutes: 5 diff --git a/tools/devops/automation/templates/tests/build.yml b/tools/devops/automation/templates/tests/build.yml index f67c5fd485c3..333ad35126af 100644 --- a/tools/devops/automation/templates/tests/build.yml +++ b/tools/devops/automation/templates/tests/build.yml @@ -63,11 +63,6 @@ steps: parameters: keyringPass: ${{ parameters.keyringPass }} -- bash: | - rm -Rf /Library/Frameworks/Xamarin.Mac.framework - rm -Rf /Library/Frameworks/Xamarin.iOS.framework - displayName: 'Remove older Frameworks' - # Use a cmdlet to check if the space available in the devices root system is larger than 50 gb. If there is not # enough space available it: # 1. Set the status of the build to error. It is not a failure since no tests have been ran. @@ -178,6 +173,11 @@ steps: provisioning_extra_args: '-vvvv' timeoutInMinutes: 250 +- bash: | + ls -R /Library/Frameworks/Xamarin.iOS.framework + ls -R /Library/Frameworks/Xamarin.Mac.framework + displayName: "Show installed Frameworks" + - bash: | set -e set -x diff --git a/tools/devops/automation/templates/tests/run-tests.yml b/tools/devops/automation/templates/tests/run-tests.yml index 856dc69fa35c..ba4348899044 100644 --- a/tools/devops/automation/templates/tests/run-tests.yml +++ b/tools/devops/automation/templates/tests/run-tests.yml @@ -84,15 +84,19 @@ steps: $versionData = Get-Content $workloadPath | ConvertFrom-Json # could be done in a loop, but we don't want to be smart just yet $iOSVersion = $versionData | Select-Object -ExpandProperty "microsoft.net.sdk.ios" + Write-Host "iOS workload version is $iOSVersion" Write-Host "##vso[task.setvariable variable=IOS_WORKLOAD_VERSION;]$iOSVersion" - + $tvOSVersion = $versionData | Select-Object -ExpandProperty "microsoft.net.sdk.tvos" + Write-Host "tvOS workload version is $tvOSVersion" Write-Host "##vso[task.setvariable variable=TVOS_WORKLOAD_VERSION;]$tvOSVersion" $macVersion = $versionData | Select-Object -ExpandProperty "microsoft.net.sdk.macos" + Write-Host "macOS workload version is $macVersion" Write-Host "##vso[task.setvariable variable=MACOS_WORKLOAD_VERSION;]$macVersion" $catalystVersion = $versionData | Select-Object -ExpandProperty "microsoft.net.sdk.maccatalyst" + Write-Host "MacCatalyst workload version is $catalystVersion " Write-Host "##vso[task.setvariable variable=MACCATALYST_WORKLOAD_VERSION;]$catalystVersion" displayName: 'Set workload versions for xtro' From 0ecfa0cdbfa5619134a62d34d1b2937c46a42bb2 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Wed, 3 Aug 2022 17:13:23 -0400 Subject: [PATCH 54/58] [submodules] Fix indentation in config file. (#15618) --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 88923a8d5dd2..eefd1092b6d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,6 +23,6 @@ url = ../../migueldeicaza/MonoTouch.Dialog branch = dotnet [submodule "api-tools"] - path = external/api-tools - url = ../../rolfbjarne/api-tools - branch = main + path = external/api-tools + url = ../../rolfbjarne/api-tools + branch = main From 31a0b13694bad41d3a1be8d741f832df7d7aec82 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Thu, 4 Aug 2022 10:31:46 -0400 Subject: [PATCH 55/58] [CI] Make sure we do not have pkgs from other builds. (#15619) --- .../automation/templates/build/build-pkgs.yml | 28 ++++++++++++++++ .../automation/templates/common/teardown.yml | 3 ++ .../automation/templates/tests/build.yml | 33 +++++++++---------- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/tools/devops/automation/templates/build/build-pkgs.yml b/tools/devops/automation/templates/build/build-pkgs.yml index 8c7a4420207f..48d01fcdddc0 100644 --- a/tools/devops/automation/templates/build/build-pkgs.yml +++ b/tools/devops/automation/templates/build/build-pkgs.yml @@ -102,6 +102,34 @@ steps: artifactName: WorkloadRollback continueOnError: true + - bash: | + var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=IOS_PACKAGE_VERSION) + IOS_PACKAGE_VERSION=${var#*=} + IOS_PACKAGE_VERSION=$(echo $IOS_PACKAGE_VERSION | cut -d "+" -f1) + + var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=MAC_PACKAGE_VERSION) + MAC_PACKAGE_VERSION=${var#*=} + MAC_PACKAGE_VERSION=$(echo $MAC_PACKAGE_VERSION | cut -d "+" -f1) + + PKG_DST="$(Build.SourcesDirectory)/PkgsVersions.json" + + echo "{" > $PKG_DST + echo "\"iOS\": \"$IOS_PACKAGE_VERSION\"," >> $PKG_DST + echo "\"macOS\": \"$MAC_PACKAGE_VERSION\"" >> $PKG_DST + echo "}" >> $PKG_DST + + echo "PkgVersions.json file contents:" + echo "$(cat $PKG_DST)" + name: pkg_versions_file + displayName: 'Generate PkgsVersions.json' + + - task: PublishPipelineArtifact@1 + displayName: 'Publish PkgsVersions.json' + inputs: + targetPath: $(Build.SourcesDirectory)/PkgsVersions.json + artifactName: PkgsVersions + continueOnError: true + # upload each of the pkgs into the pipeline artifacts - task: PublishPipelineArtifact@1 displayName: 'Publish Build Artifacts' diff --git a/tools/devops/automation/templates/common/teardown.yml b/tools/devops/automation/templates/common/teardown.yml index 2a58faeac008..90be27cd5f0d 100644 --- a/tools/devops/automation/templates/common/teardown.yml +++ b/tools/devops/automation/templates/common/teardown.yml @@ -13,6 +13,9 @@ steps: displayName: 'Remove git creds store' condition: always() +- bash: | + sudo rm -Rf $(Build.SourcesDirectory)/artifacts + displayName: "Remove artifacts" - template: uninstall-certificates/v1.yml@templates parameters: diff --git a/tools/devops/automation/templates/tests/build.yml b/tools/devops/automation/templates/tests/build.yml index 333ad35126af..60b9109d9f65 100644 --- a/tools/devops/automation/templates/tests/build.yml +++ b/tools/devops/automation/templates/tests/build.yml @@ -116,29 +116,26 @@ steps: AUTH_TOKEN_VSENG_XAMARIN_MAC_DEVICES_P12: ${{ parameters.xqaCertPass }} AUTH_TOKEN_VSENG_XAMARIN_MAC_DEVICES_2_P12: ${{ parameters.xqaCertPass }} -# download the not notarized pkgs since we do not need them to be signed - task: DownloadPipelineArtifact@2 - displayName: Download not notaraized build + displayName: Download artifacts inputs: - artifact: 'not-signed-package' allowFailedBuilds: true - path: $(Build.SourcesDirectory)/package + path: $(Build.SourcesDirectory)/artifacts - pwsh: | - $dir = "$(Build.SourcesDirectory)/package" - Dir $dir - $items = Get-ChildItem $dir -Recurse - foreach ($i in $items) { - if ($i.Name -like "xamarin.ios-*.pkg") { - $path = $i.FullName - Write-Host "##vso[task.setvariable variable=XI_PACKAGE;]$path" - } - if ($i.Name -like "xamarin.mac-*.pkg") { - $path = $i.FullName - Write-Host "##vso[task.setvariable variable=XM_PACKAGE;]$path" - } - } - displayName: 'Set iOS pkgs url' + $dir = "$(Build.SourcesDirectory)/artifacts" + $versionsPath = "$dir/PkgsVersions/PkgsVersions.json" + $versionData = Get-Content $versionsPath | ConvertFrom-Json + + $iOSVersion = $versionData | Select-Object -ExpandProperty "iOS" + $iOSPath = "$dir/not-signed-package/xamarin.ios-$iOSVersion.pkg" + Write-Host "##vso[task.setvariable variable=XI_PACKAGE;]$iOSPath" + + $macOSVersion = $versionData | Select-Object -ExpandProperty "macOS" + $macOSPath = "$dir/not-signed-package/xamarin.mac-$macOSVersion.pkg" + Write-Host "##vso[task.setvariable variable=XM_PACKAGE;]$macOSPath" + + displayName: 'Set pkgs url' timeoutInMinutes: 5 - bash: | From 946cc523d1883401124a57c460a014bef8a06494 Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Thu, 4 Aug 2022 20:46:43 -0400 Subject: [PATCH 56/58] [net7.0] bump linker to net7.0 --- tools/dotnet-linker/Makefile | 2 +- tools/dotnet-linker/dotnet-linker.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/dotnet-linker/Makefile b/tools/dotnet-linker/Makefile index 1689e9b19a1f..779f13fc4d5e 100644 --- a/tools/dotnet-linker/Makefile +++ b/tools/dotnet-linker/Makefile @@ -3,7 +3,7 @@ TOP=../.. include $(TOP)/Make.config include $(TOP)/mk/rules.mk -BUILD_DIR=bin/Debug/net6.0 +BUILD_DIR=bin/Debug/net7.0 DOTNET_TARGETS += \ $(BUILD_DIR)/dotnet-linker.dll \ diff --git a/tools/dotnet-linker/dotnet-linker.csproj b/tools/dotnet-linker/dotnet-linker.csproj index f9a0fa3ae6d4..5aed7df2db6a 100644 --- a/tools/dotnet-linker/dotnet-linker.csproj +++ b/tools/dotnet-linker/dotnet-linker.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 dotnet_linker $(DefineConstants);BUNDLER true From 8e435944f57de310e885903a99972c1f42c3ce91 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 5 Aug 2022 13:36:44 -0500 Subject: [PATCH 57/58] Copy 7.0.100 sdk-manifest files The build was failing with errors like: Could not find workload 'microsoft-net-runtime-tvos' extended by workload 'tvos' in manifest 'microsoft.net.sdk.tvos' I found I could copy the mono/emscripten workloads from 7.0.100 to 7.0.100-rc.1 to get past this. I looked at the xamarin-android build tree, and we were doing this... But I don't exactly remember why -- or if it was Peter or I that did it. --- dotnet/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dotnet/Makefile b/dotnet/Makefile index 923b7a1128a1..a213de88320a 100644 --- a/dotnet/Makefile +++ b/dotnet/Makefile @@ -76,6 +76,11 @@ DIRECTORIES += \ $(DIRECTORIES): $(Q) mkdir -p $@ +.stamp-cp-mono-workload: $(TOP)/Make.config + $(CP) -r $(DOTNET_MANIFESTS_PATH)/../$(DOTNET_MANIFEST_VERSION_BAND)/* $(DOTNET_MANIFESTS_PATH)/ + $(Q) touch $@ +TARGETS += .stamp-cp-mono-workload + CURRENT_HASH_LONG:=$(shell git log -1 --pretty=%H) $(DOTNET_DESTDIR)/Microsoft.%: Microsoft.% | $(foreach platform,$(DOTNET_PLATFORMS),$(DOTNET_DESTDIR)/Microsoft.$(platform).Sdk/data $(DOTNET_DESTDIR)/Microsoft.$(platform).Sdk/Sdk $(DOTNET_DESTDIR)/Microsoft.$(platform).Sdk/targets $(DOTNET_DESTDIR)/Microsoft.$(platform).Templates) \ From efb3a0ed77412e0cd4c55b19148ef74aa26916bb Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 5 Aug 2022 15:45:45 -0500 Subject: [PATCH 58/58] Add a mkdir to create $(DOTNET_MANIFESTS_PATH) --- dotnet/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/dotnet/Makefile b/dotnet/Makefile index a213de88320a..c4e37f0d6df9 100644 --- a/dotnet/Makefile +++ b/dotnet/Makefile @@ -77,6 +77,7 @@ $(DIRECTORIES): $(Q) mkdir -p $@ .stamp-cp-mono-workload: $(TOP)/Make.config + mkdir -p $(DOTNET_MANIFESTS_PATH) $(CP) -r $(DOTNET_MANIFESTS_PATH)/../$(DOTNET_MANIFEST_VERSION_BAND)/* $(DOTNET_MANIFESTS_PATH)/ $(Q) touch $@ TARGETS += .stamp-cp-mono-workload