From 6cab30b9baf23448e3638f0cc121a6ce0b7cc8ff Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 23 Jan 2025 17:41:17 +0200 Subject: [PATCH 1/5] Update the comment for the test properties --- .../BaseBuildTest.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs index f305cceda377..76a675bbca91 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs @@ -13,8 +13,21 @@ public abstract class BaseBuildTest public const string DotNetCurrent = "net9.0"; public const string DotNetPrevious = "net8.0"; - public const string MauiVersionCurrent = "9.0.0-rc.1.24453.9"; // this should not be the same as the last release - public const string MauiVersionPrevious = "8.0.72"; // this should not be the same version as the default. aka: MicrosoftMauiPreviousDotNetReleasedVersion in eng/Versions.props + // Versions of .NET MAUI that are used when testing the property. These should preferrably + // different to the defaults in the SDKs such that the tests can test what would happen if the user puts + // some arbitrary number in . The actual numbers do not mayyer as much, as long as they trigger + // the MSBuild targets that would download some version that is only on nuget.org and not in the workload. + // + // MauiVersionCurrent: this should be the current .NET version of MAUI, but the latest released build. + // For example, if this branch is for .NET 9, then this must be a 9.0.x number. If the latest MAUI release + // is 9.0.100, then this should preferrable be some older build to make sure things work, like 9.0.30. + public const string MauiVersionCurrent = "9.0.0-rc.1.24453.9"; + // MauiVersionPrevious: this should be the previous .NET version of MAUI. + // For example, if this branch is for .NET 9, then this mush be a 8.0.x number, but should preferrably + // not be the same as the default in MicrosoftMauiPreviousDotNetReleasedVersion in eng/Versions.props + // as this would result in the tests not testing anything. If the .NET 9 version of MAUI pulls in 8.0.100 + // of the .NET 8 MAUI, then this should be 8.0.80 for example. + public const string MauiVersionPrevious = "8.0.72"; char[] invalidChars = { '{', '}', '(', ')', '$', ':', ';', '\"', '\'', ',', '=', '.', '-', ' ', }; From 30882969cd64b626885064f1e3fa6ff1e86f076c Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 23 Jan 2025 15:46:08 +0000 Subject: [PATCH 2/5] Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs index 76a675bbca91..5ea26b25b8e5 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs @@ -15,7 +15,7 @@ public abstract class BaseBuildTest // Versions of .NET MAUI that are used when testing the property. These should preferrably // different to the defaults in the SDKs such that the tests can test what would happen if the user puts - // some arbitrary number in . The actual numbers do not mayyer as much, as long as they trigger + // some arbitrary number in . The actual numbers do not matter as much, as long as they trigger // the MSBuild targets that would download some version that is only on nuget.org and not in the workload. // // MauiVersionCurrent: this should be the current .NET version of MAUI, but the latest released build. @@ -23,7 +23,7 @@ public abstract class BaseBuildTest // is 9.0.100, then this should preferrable be some older build to make sure things work, like 9.0.30. public const string MauiVersionCurrent = "9.0.0-rc.1.24453.9"; // MauiVersionPrevious: this should be the previous .NET version of MAUI. - // For example, if this branch is for .NET 9, then this mush be a 8.0.x number, but should preferrably + // For example, if this branch is for .NET 9, then this must be a 8.0.x number, but should preferrably // not be the same as the default in MicrosoftMauiPreviousDotNetReleasedVersion in eng/Versions.props // as this would result in the tests not testing anything. If the .NET 9 version of MAUI pulls in 8.0.100 // of the .NET 8 MAUI, then this should be 8.0.80 for example. From aa1a3a6dec0f46f9db1679b6d4ff389f443480b6 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 23 Jan 2025 18:02:15 +0200 Subject: [PATCH 3/5] Update src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs Co-authored-by: Rui Marinho --- .../src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs index 5ea26b25b8e5..9ad4128d4c03 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs @@ -21,7 +21,7 @@ public abstract class BaseBuildTest // MauiVersionCurrent: this should be the current .NET version of MAUI, but the latest released build. // For example, if this branch is for .NET 9, then this must be a 9.0.x number. If the latest MAUI release // is 9.0.100, then this should preferrable be some older build to make sure things work, like 9.0.30. - public const string MauiVersionCurrent = "9.0.0-rc.1.24453.9"; + public const string MauiVersionCurrent = "9.0.20"; // MauiVersionPrevious: this should be the previous .NET version of MAUI. // For example, if this branch is for .NET 9, then this must be a 8.0.x number, but should preferrably // not be the same as the default in MicrosoftMauiPreviousDotNetReleasedVersion in eng/Versions.props From 4534d43e70251e83daf48fc112792f5fc0da3ca0 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 23 Jan 2025 18:04:06 +0200 Subject: [PATCH 4/5] Update src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs --- .../src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs index 9ad4128d4c03..460ceb757447 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs @@ -27,7 +27,7 @@ public abstract class BaseBuildTest // not be the same as the default in MicrosoftMauiPreviousDotNetReleasedVersion in eng/Versions.props // as this would result in the tests not testing anything. If the .NET 9 version of MAUI pulls in 8.0.100 // of the .NET 8 MAUI, then this should be 8.0.80 for example. - public const string MauiVersionPrevious = "8.0.72"; + public const string MauiVersionPrevious = "8.0.93"; char[] invalidChars = { '{', '}', '(', ')', '$', ':', ';', '\"', '\'', ',', '=', '.', '-', ' ', }; From 50a19f2d48c4af823a8ce253cbd3d91c86a7395e Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Tue, 22 Apr 2025 17:30:46 -0500 Subject: [PATCH 5/5] Update BaseBuildTest.cs --- .../src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs index 460ceb757447..c8c6716a4e6a 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs @@ -21,7 +21,7 @@ public abstract class BaseBuildTest // MauiVersionCurrent: this should be the current .NET version of MAUI, but the latest released build. // For example, if this branch is for .NET 9, then this must be a 9.0.x number. If the latest MAUI release // is 9.0.100, then this should preferrable be some older build to make sure things work, like 9.0.30. - public const string MauiVersionCurrent = "9.0.20"; + public const string MauiVersionCurrent = "9.0.14"; // MauiVersionPrevious: this should be the previous .NET version of MAUI. // For example, if this branch is for .NET 9, then this must be a 8.0.x number, but should preferrably // not be the same as the default in MicrosoftMauiPreviousDotNetReleasedVersion in eng/Versions.props