From 76df4981c03c37627fcb3443d7bb3f56148b351b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Dec 2022 18:56:14 +0000 Subject: [PATCH 01/24] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-2cd03f67964877613b104ed2dc13a7a2f4ebaefa-1 Microsoft.Android.Sdk.Windows From Version 33.0.4 -> To Version 33.0.17 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rtm.22519.39 -> To Version 7.0.101-servicing.22571.1 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40db06ee4699..a3378bfefa08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - e6dd91c290b808f971a1ac69c2fb29395bbf1051 + d02d33e069bf59d00b6374e304d39d6ceb20e18a - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://github.com/xamarin/xamarin-android - 8f1d9a47205ead80132661f68b0cee9ed0e0220b + 2cd03f67964877613b104ed2dc13a7a2f4ebaefa https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios ceb4326735ea1229055daec657092c1074ffebcd - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 060605dcd348..bd7d94216317 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.548 - 7.0.100-rtm.22519.39 + 7.0.101-servicing.22571.1 - 7.0.0-rtm.22511.4 + 7.0.0 7.0.0 7.0.0 7.0.0 - 33.0.4 + 33.0.17 16.1.1478 13.0.2033 @@ -20,7 +20,7 @@ 7.0.100 - 7.0.0-rtm.22504.3 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.2.221109.1 From c415029defebc31e75180f1504dc0370683f8bf4 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 12 Dec 2022 11:48:02 +0000 Subject: [PATCH 02/24] Add --skip-sign-check to dotnet workload install --- src/DotNet/DotNet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj index 73af4f3e7f83..0aae717b5a81 100644 --- a/src/DotNet/DotNet.csproj +++ b/src/DotNet/DotNet.csproj @@ -168,7 +168,7 @@ Inputs="$(_Inputs)" Outputs="$(DotNetPacksDirectory).stamp"> From bc59cd8c7a958626ae144b8a9a4670b1838268d5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 12 Dec 2022 20:23:49 +0200 Subject: [PATCH 03/24] Only set R2R on WinExe --- .nuspec/Microsoft.Maui.Controls.SingleProject.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nuspec/Microsoft.Maui.Controls.SingleProject.props b/.nuspec/Microsoft.Maui.Controls.SingleProject.props index d4d5c02e0222..cd2605e51cd3 100644 --- a/.nuspec/Microsoft.Maui.Controls.SingleProject.props +++ b/.nuspec/Microsoft.Maui.Controls.SingleProject.props @@ -6,7 +6,7 @@ true false true - true + true <_SingleProjectRIDRequired Condition="'$(OutputType)' == 'WinExe'">true <_SingleProjectRIDSpecified Condition="'$(RuntimeIdentifier)' != '' or '$(RuntimeIdentifiers)' != ''">true From 65f654a9222cdae64af1400733bf90504cc2c43a Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 13 Dec 2022 12:25:37 +0000 Subject: [PATCH 04/24] [build] Add more --skip-sign-check to install workloads for samples --- src/DotNet/DotNet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj index 0aae717b5a81..5b4826f3f474 100644 --- a/src/DotNet/DotNet.csproj +++ b/src/DotNet/DotNet.csproj @@ -75,7 +75,7 @@ - + From f96161d0fd36da6e279643ebe67b81daab6b3c39 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 13 Dec 2022 15:13:06 +0000 Subject: [PATCH 05/24] Update Nuget.Config for runtime 6.0.12 --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 496a9ded7306..988cfff68ae0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,9 @@ - - - + + + From b2af7a239fab385332726bdf07312237dd9a34e5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Dec 2022 02:29:21 +0200 Subject: [PATCH 06/24] Update Microsoft.Maui.Controls.SingleProject.props --- .nuspec/Microsoft.Maui.Controls.SingleProject.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.nuspec/Microsoft.Maui.Controls.SingleProject.props b/.nuspec/Microsoft.Maui.Controls.SingleProject.props index cd2605e51cd3..632dfde6bd38 100644 --- a/.nuspec/Microsoft.Maui.Controls.SingleProject.props +++ b/.nuspec/Microsoft.Maui.Controls.SingleProject.props @@ -6,7 +6,8 @@ true false true - true + + true <_SingleProjectRIDRequired Condition="'$(OutputType)' == 'WinExe'">true <_SingleProjectRIDSpecified Condition="'$(RuntimeIdentifier)' != '' or '$(RuntimeIdentifiers)' != ''">true From 94e79c1c9767a22e9a7064cacf9b1ecdcd5c891e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Dec 2022 04:13:53 +0200 Subject: [PATCH 07/24] Update dotnet.cake --- eng/cake/dotnet.cake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index ba6e4908e00e..63e59b422c41 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -608,6 +608,9 @@ void RunMSBuildWithDotNet( var binlog = string.IsNullOrEmpty(targetFramework) ? $"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{type}.binlog\"" : $"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{targetFramework}-{type}.binlog\""; + var pp = string.IsNullOrEmpty(targetFramework) ? + $"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{type}.pp.txt\"" : + $"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{targetFramework}-{type}.pp.txt\""; if(localDotnet) SetDotNetEnvironmentVariables(); @@ -616,7 +619,8 @@ void RunMSBuildWithDotNet( .SetConfiguration(configuration) .SetMaxCpuCount(maxCpuCount) .WithTarget(target) - .EnableBinaryLogger(binlog); + .EnableBinaryLogger(binlog) + .WithProperty("pp", pp); if (warningsAsError) { From f0c611dce10d65f55971401d3e325a998c0f1554 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Dec 2022 04:15:22 +0200 Subject: [PATCH 08/24] Update dotnet.cake --- eng/cake/dotnet.cake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index 63e59b422c41..c55012798765 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -191,7 +191,7 @@ Task("dotnet-templates") ""); // Build - RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild); + RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild, onlyPreprocess: true); // Pack if (alsoPack.Contains(templateName)) { @@ -599,7 +599,8 @@ void RunMSBuildWithDotNet( bool restore = true, string targetFramework = null, bool forceDotNetBuild = false, - int maxCpuCount = 0) + int maxCpuCount = 0, + bool onlyPreprocess = false) { var useDotNetBuild = forceDotNetBuild || !IsRunningOnWindows() || target == "Run"; @@ -619,8 +620,9 @@ void RunMSBuildWithDotNet( .SetConfiguration(configuration) .SetMaxCpuCount(maxCpuCount) .WithTarget(target) - .EnableBinaryLogger(binlog) - .WithProperty("pp", pp); + .EnableBinaryLogger(binlog); + if(onlyPreprocess) + msbuildSettings.WithProperty("pp", pp); if (warningsAsError) { From 8eecfd7a8e04d7495acaac4ba45f0611461e55b9 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Dec 2022 05:04:42 +0200 Subject: [PATCH 09/24] Update dotnet.cake --- eng/cake/dotnet.cake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index c55012798765..06bf797cd38a 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -617,12 +617,13 @@ void RunMSBuildWithDotNet( SetDotNetEnvironmentVariables(); var msbuildSettings = new DotNetCoreMSBuildSettings() + { + ArgumentCustomization = args => onlyPreprocess ? args.Append($"-pp=\"{pp}\"") : args + } .SetConfiguration(configuration) .SetMaxCpuCount(maxCpuCount) .WithTarget(target) .EnableBinaryLogger(binlog); - if(onlyPreprocess) - msbuildSettings.WithProperty("pp", pp); if (warningsAsError) { From f980cc53d4b81935333dcc20491b79234899c4ac Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Dec 2022 13:18:09 +0200 Subject: [PATCH 10/24] Update dotnet.cake --- eng/cake/dotnet.cake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index 06bf797cd38a..e29c7ee5bf29 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -616,10 +616,7 @@ void RunMSBuildWithDotNet( if(localDotnet) SetDotNetEnvironmentVariables(); - var msbuildSettings = new DotNetCoreMSBuildSettings() - { - ArgumentCustomization = args => onlyPreprocess ? args.Append($"-pp=\"{pp}\"") : args - } + var msbuildSettings = new DotNetCoreMSBuildSettings(); .SetConfiguration(configuration) .SetMaxCpuCount(maxCpuCount) .WithTarget(target) @@ -651,6 +648,9 @@ void RunMSBuildWithDotNet( if (!string.IsNullOrEmpty(targetFramework)) args.Append($"-f {targetFramework}"); + if (onlyPreprocess) + args.Append($"-pp=\"{pp}\""); + return args; }; From 7cac3f48b3d9add53141e41547c90aa9c26d508f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Dec 2022 17:40:28 +0200 Subject: [PATCH 11/24] Update dotnet.cake --- eng/cake/dotnet.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index e29c7ee5bf29..52153aa29ca6 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -616,7 +616,7 @@ void RunMSBuildWithDotNet( if(localDotnet) SetDotNetEnvironmentVariables(); - var msbuildSettings = new DotNetCoreMSBuildSettings(); + var msbuildSettings = new DotNetCoreMSBuildSettings() .SetConfiguration(configuration) .SetMaxCpuCount(maxCpuCount) .WithTarget(target) From 06e9c325c82d225b73c9369408947eafe36e3568 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Dec 2022 18:11:47 +0200 Subject: [PATCH 12/24] Update dotnet.cake --- eng/cake/dotnet.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index 52153aa29ca6..efa5b40e42e0 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -649,7 +649,7 @@ void RunMSBuildWithDotNet( args.Append($"-f {targetFramework}"); if (onlyPreprocess) - args.Append($"-pp=\"{pp}\""); + args.Append($"/pp:\"{pp}\""); return args; }; From 7de3f3813be19b42ab3c4a65d70a956e7887ff05 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Dec 2022 20:04:45 +0200 Subject: [PATCH 13/24] revert hax --- .nuspec/Microsoft.Maui.Controls.SingleProject.props | 3 +-- eng/cake/dotnet.cake | 11 ++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.nuspec/Microsoft.Maui.Controls.SingleProject.props b/.nuspec/Microsoft.Maui.Controls.SingleProject.props index 632dfde6bd38..4b68a499bfc8 100644 --- a/.nuspec/Microsoft.Maui.Controls.SingleProject.props +++ b/.nuspec/Microsoft.Maui.Controls.SingleProject.props @@ -6,8 +6,7 @@ true false true - - true + true <_SingleProjectRIDRequired Condition="'$(OutputType)' == 'WinExe'">true <_SingleProjectRIDSpecified Condition="'$(RuntimeIdentifier)' != '' or '$(RuntimeIdentifiers)' != ''">true diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index f1f2803d3cd9..2ff307397d01 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -191,7 +191,7 @@ Task("dotnet-templates") ""); // Build - RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild, onlyPreprocess: true); + RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild); // Pack if (alsoPack.Contains(templateName)) { @@ -603,8 +603,7 @@ void RunMSBuildWithDotNet( bool restore = true, string targetFramework = null, bool forceDotNetBuild = false, - int maxCpuCount = 0, - bool onlyPreprocess = false) + int maxCpuCount = 0) { var useDotNetBuild = forceDotNetBuild || !IsRunningOnWindows() || target == "Run"; @@ -613,9 +612,6 @@ void RunMSBuildWithDotNet( var binlog = string.IsNullOrEmpty(targetFramework) ? $"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{type}.binlog\"" : $"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{targetFramework}-{type}.binlog\""; - var pp = string.IsNullOrEmpty(targetFramework) ? - $"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{type}.pp.txt\"" : - $"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{targetFramework}-{type}.pp.txt\""; if(localDotnet) SetDotNetEnvironmentVariables(); @@ -652,9 +648,6 @@ void RunMSBuildWithDotNet( if (!string.IsNullOrEmpty(targetFramework)) args.Append($"-f {targetFramework}"); - if (onlyPreprocess) - args.Append($"/pp:\"{pp}\""); - return args; }; From d11768644a957ef855d2e39d09bd99caef7d34cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Dec 2022 01:21:33 +0000 Subject: [PATCH 14/24] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-4827145183c37f4fe865e7ea14e0bcd088595305-1 Microsoft.Android.Sdk.Windows From Version 33.0.4 -> To Version 33.0.20 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rtm.22519.39 -> To Version 7.0.101-servicing.22571.1 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc2140c4e897..ad3a9f85653a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/installer d02d33e069bf59d00b6374e304d39d6ceb20e18a - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://github.com/dotnet/runtime + de84cf9f723f5d4342e95c692d088ed2af63fdbe - + https://github.com/xamarin/xamarin-android - 2cd03f67964877613b104ed2dc13a7a2f4ebaefa + 4827145183c37f4fe865e7ea14e0bcd088595305 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios 38105f7c18ee2a8dd727b5ec9bf86854b1140d2d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 73eb13444bdee019ec91191f96fd866661acbc78 - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 73eb13444bdee019ec91191f96fd866661acbc78 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 5152b45e2ff1..dfdddc1cc255 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,13 +5,13 @@ 7.0.101-servicing.22571.1 - 7.0.0 + 7.0.1 7.0.0 7.0.0 7.0.0 - 33.0.17 + 33.0.20 16.1.1492 13.0.2047 @@ -20,7 +20,7 @@ 7.0.100 - 7.0.0 + 7.0.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.2.221116.1 From f3f84ecdf2ec8f845462312532335a7c6d0045f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Dec 2022 17:29:37 +0000 Subject: [PATCH 15/24] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-747554c0c9e66fa1d0b8d61653de5dce3b684e73-1 Microsoft.Android.Sdk.Windows From Version 33.0.4 -> To Version 33.0.21 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rtm.22519.39 -> To Version 7.0.101-servicing.22571.1 (parent: Microsoft.Android.Sdk.Windows --- 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 ad3a9f85653a..bb1c00116050 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime de84cf9f723f5d4342e95c692d088ed2af63fdbe - + https://github.com/xamarin/xamarin-android - 4827145183c37f4fe865e7ea14e0bcd088595305 + 747554c0c9e66fa1d0b8d61653de5dce3b684e73 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index dfdddc1cc255..314c16b41da3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 7.0.0 7.0.0 - 33.0.20 + 33.0.21 16.1.1492 13.0.2047 From 658638eecc911ef306e2b2c2b94f94d63dd3fe72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Dec 2022 02:22:57 +0000 Subject: [PATCH 16/24] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-41a69938731028bee1dd4dc62f3b996f717505b2-1 Microsoft.Android.Sdk.Windows From Version 33.0.4 -> To Version 33.0.22 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rtm.22519.39 -> To Version 7.0.101-servicing.22571.1 (parent: Microsoft.Android.Sdk.Windows --- NuGet.config | 5 +++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 988cfff68ae0..7cea290b3978 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,15 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb1c00116050..faf37264b860 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/installer d02d33e069bf59d00b6374e304d39d6ceb20e18a - + https://github.com/dotnet/runtime - de84cf9f723f5d4342e95c692d088ed2af63fdbe + 8ac3832812f9bc37fba2a66ac8987ca66d381d85 - + https://github.com/xamarin/xamarin-android - 747554c0c9e66fa1d0b8d61653de5dce3b684e73 + 41a69938731028bee1dd4dc62f3b996f717505b2 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios 38105f7c18ee2a8dd727b5ec9bf86854b1140d2d - + https://github.com/dotnet/emsdk - 73eb13444bdee019ec91191f96fd866661acbc78 + d71ea7cbed84152a921c7b7b4b4439c306bf9130 - + https://github.com/dotnet/emsdk - 73eb13444bdee019ec91191f96fd866661acbc78 + d71ea7cbed84152a921c7b7b4b4439c306bf9130 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 314c16b41da3..8fc27b346d80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,13 +5,13 @@ 7.0.101-servicing.22571.1 - 7.0.1 + 7.0.2 7.0.0 7.0.0 7.0.0 - 33.0.21 + 33.0.22 16.1.1492 13.0.2047 @@ -20,7 +20,7 @@ 7.0.100 - 7.0.1 + 7.0.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.2.221116.1 From 9b9b11ee7dc4f9cfb53dda62a149616baf3947b7 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 3 Jan 2023 12:32:20 +0000 Subject: [PATCH 17/24] Update feeds --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7cea290b3978..0502a36bc557 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,9 +24,9 @@ - - - + + + From 3c2a713ab7ff9fca2361cd042fa8e5081e30f594 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Jan 2023 03:59:23 +0000 Subject: [PATCH 18/24] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-af18b843d16f5ecad3171016fb66efecdb78c4bf-1 Microsoft.Android.Sdk.Windows From Version 33.0.4 -> To Version 33.0.26 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rtm.22519.39 -> To Version 7.0.102-servicing.22609.1 (parent: Microsoft.Android.Sdk.Windows --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0502a36bc557..0a4ef81866ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index faf37264b860..2ef9c4a7da4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - d02d33e069bf59d00b6374e304d39d6ceb20e18a + 3c4322d8e5f92a3a2a2d51095c2f06bb1c033b88 https://github.com/dotnet/runtime 8ac3832812f9bc37fba2a66ac8987ca66d381d85 - + https://github.com/xamarin/xamarin-android - 41a69938731028bee1dd4dc62f3b996f717505b2 + af18b843d16f5ecad3171016fb66efecdb78c4bf https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 8fc27b346d80..b27c35567931 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6.0.550 - 7.0.101-servicing.22571.1 + 7.0.102-servicing.22609.1 7.0.2 @@ -11,7 +11,7 @@ 7.0.0 7.0.0 - 33.0.22 + 33.0.26 16.1.1492 13.0.2047 From ba3c11f3ba5902c7ac3edc1b71b35b92c70bad1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jan 2023 19:28:27 +0000 Subject: [PATCH 19/24] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-26d6167c7ae14217042fa6bd524cf0e20332e4e3-1 Microsoft.Android.Sdk.Windows From Version 33.0.4 -> To Version 33.0.31 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rtm.22519.39 -> To Version 7.0.102-servicing.22609.1 (parent: Microsoft.Android.Sdk.Windows --- NuGet.config | 9 ++++----- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0a4ef81866ed..f40c742ea906 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,15 +6,14 @@ - + - - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb3adbc73f01..9b1decadffcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/installer 3c4322d8e5f92a3a2a2d51095c2f06bb1c033b88 - + https://github.com/dotnet/runtime - 8ac3832812f9bc37fba2a66ac8987ca66d381d85 + 7db1c3333302d4d5ac97a5cfb28e88e5c2cde968 - + https://github.com/xamarin/xamarin-android - af18b843d16f5ecad3171016fb66efecdb78c4bf + 26d6167c7ae14217042fa6bd524cf0e20332e4e3 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios d06856ad79b9fb77de944b3f59a1fc799964a496 - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 42c2862cd231..89745077843c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,13 +5,13 @@ 7.0.102-servicing.22609.1 - 7.0.2 + 7.0.3 7.0.0 7.0.0 7.0.0 - 33.0.26 + 33.0.31 16.2.1024 13.1.1024 @@ -20,7 +20,7 @@ 7.0.100 - 7.0.2 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.2.221209.1 From cdf1f3c5773e39d4ddfec21ed056abf7f63c389f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jan 2023 19:34:43 +0000 Subject: [PATCH 20/24] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-1d146df317ff971f3c59464a23ad2c7538872fb6-1 Microsoft.Android.Sdk.Windows From Version 33.0.4 -> To Version 33.0.32 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rtm.22519.39 -> To Version 7.0.103-servicing.23073.22 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b1decadffcc..74327b79aa64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 3c4322d8e5f92a3a2a2d51095c2f06bb1c033b88 + e36f7f3feaa561782a66165b8db55f4c0bbdf963 https://github.com/dotnet/runtime 7db1c3333302d4d5ac97a5cfb28e88e5c2cde968 - + https://github.com/xamarin/xamarin-android - 26d6167c7ae14217042fa6bd524cf0e20332e4e3 + 1d146df317ff971f3c59464a23ad2c7538872fb6 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 89745077843c..c89c84334c0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6.0.552 - 7.0.102-servicing.22609.1 + 7.0.103-servicing.23073.22 7.0.3 @@ -11,7 +11,7 @@ 7.0.0 7.0.0 - 33.0.31 + 33.0.32 16.2.1024 13.1.1024 From 00bf23b236c3a7438f79fed9c44095a79062d372 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 10 Feb 2023 11:24:17 +0000 Subject: [PATCH 21/24] Try fix build --- eng/cake/dotnet.cake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index 70bc78802b78..8644fde1904b 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -88,9 +88,14 @@ Task("dotnet-build") { RunMSBuildWithDotNet("./Microsoft.Maui.BuildTasks.slnf"); if (IsRunningOnWindows()) + { RunMSBuildWithDotNet("./Microsoft.Maui.sln", maxCpuCount: 1); + } else - RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf", maxCpuCount: 1); + { + // NOTE: intentionally omit maxCpuCount, to avoid an issue with the 7.0.100 .NET SDK + RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf"); + } }); Task("dotnet-samples") From 1a9021012e2f906893a17976549b6214bb4c10f2 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 10 Feb 2023 09:29:59 -0600 Subject: [PATCH 22/24] Update NuGet.config --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index f40c742ea906..aacc65aa155a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,9 +23,9 @@ - - - + + + From 45f988ac892d6dfd0bc6beaf73734ed2ce6dadc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 16:50:36 +0000 Subject: [PATCH 23/24] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-1d146df317ff971f3c59464a23ad2c7538872fb6-1 Microsoft.Android.Sdk.Windows From Version 33.0.4 -> To Version 33.0.32 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rtm.22519.39 -> To Version 7.0.103-servicing.23073.22 (parent: Microsoft.Android.Sdk.Windows --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index aacc65aa155a..8f43edb20176 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,6 +12,8 @@ + + From b92021dfb1d87ff900a74dd5c44bb089d80042ee Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Sat, 11 Feb 2023 15:23:11 -0600 Subject: [PATCH 24/24] Backport parts of f830ec0 --- .../tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj | 2 ++ .../Maui.Controls.Sample.Profiling.csproj | 2 ++ .../Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj | 2 ++ .../samples/Controls.Sample/Maui.Controls.Sample.csproj | 2 ++ src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj | 2 ++ src/Core/tests/DeviceTests/Core.DeviceTests.csproj | 2 ++ src/Essentials/samples/Samples/Essentials.Sample.csproj | 2 ++ src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj | 2 ++ src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj | 2 ++ .../DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj | 2 ++ 10 files changed, 20 insertions(+) diff --git a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj index c29f24aa0b4b..b004c3c281ba 100644 --- a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj +++ b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj @@ -7,6 +7,8 @@ Microsoft.Maui.MauiBlazorWebView.DeviceTests Microsoft.Maui.MauiBlazorWebView.DeviceTests $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj b/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj index 703d0b08be71..2dbb53f863ea 100644 --- a/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj +++ b/src/Controls/samples/Controls.Sample.Profiling/Maui.Controls.Sample.Profiling.csproj @@ -11,6 +11,8 @@ 1 false true + + maccatalyst-x64 diff --git a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj index 05a4b3e42ea0..6a18a3957423 100644 --- a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj +++ b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj @@ -5,6 +5,8 @@ Exe true false + + maccatalyst-x64 diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index 05ad55b47484..8e240e7b0127 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -8,6 +8,8 @@ Maui.Controls.Sample false $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj index cd867390d54e..ae03466f1b4b 100644 --- a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj +++ b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj @@ -7,6 +7,8 @@ Microsoft.Maui.DeviceTests Microsoft.Maui.Controls.DeviceTests $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj index 9a738a7bcb2f..38b4ce0f3b8a 100644 --- a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj +++ b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj @@ -7,6 +7,8 @@ Microsoft.Maui.DeviceTests Microsoft.Maui.Core.DeviceTests $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Essentials/samples/Samples/Essentials.Sample.csproj b/src/Essentials/samples/Samples/Essentials.Sample.csproj index 75811e62aa6d..fa9bf1646cca 100644 --- a/src/Essentials/samples/Samples/Essentials.Sample.csproj +++ b/src/Essentials/samples/Samples/Essentials.Sample.csproj @@ -8,6 +8,8 @@ true false $(NoWarn),CA1416 + + maccatalyst-x64 diff --git a/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj b/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj index 04620193cd70..0baae6cdbf5c 100644 --- a/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj +++ b/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj @@ -6,6 +6,8 @@ true Microsoft.Maui.Essentials.DeviceTests Microsoft.Maui.Essentials.DeviceTests + + maccatalyst-x64 diff --git a/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj b/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj index 940430bf939a..f2d99b603559 100644 --- a/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj +++ b/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj @@ -6,6 +6,8 @@ true Microsoft.Maui.Graphics.DeviceTests Microsoft.Maui.Graphics.DeviceTests + + maccatalyst-x64 diff --git a/src/TestUtils/samples/DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj b/src/TestUtils/samples/DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj index 15e2be0f48db..30745bd73bcd 100644 --- a/src/TestUtils/samples/DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj +++ b/src/TestUtils/samples/DeviceTests.Sample/TestUtils.DeviceTests.Sample.csproj @@ -6,6 +6,8 @@ true Microsoft.Maui.TestUtils.DeviceTests.Sample Microsoft.Maui.TestUtils.DeviceTests.Sample + + maccatalyst-x64