From 11c7ffe1ba764d1c89d0a567d7c77595133aee6d Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 24 Jul 2024 15:29:35 +0100 Subject: [PATCH 01/17] [ci] Update sdk preview7 --- 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 efa241f3b071..dd4435ed55cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 9a028e12b90e6a583b09ccb3008fdfaf85761f19 + e23d1d49eae1c44585cd5840a7412471498fc8c4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e414d3488a8a..7a0f31eb045a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 8.0.70 - 9.0.100-preview.7.24360.5 + 9.0.100-preview.7.24374.2 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 From 143d482aa6c6baaea66f2c557b9ab15d10fcaf01 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 24 Jul 2024 15:37:57 +0100 Subject: [PATCH 02/17] [net9.0] Update references for aspnet --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd4435ed55cb..37f8ab646bcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,57 +35,57 @@ https://github.com/dotnet/emsdk 99ea0c06b84d3084d090da537080dd35d2a193cf - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + fba8bd53f16f4c908c108017f1de93cacb8d6675 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7a0f31eb045a..0e88e370b7cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,19 +66,19 @@ 10.0.22621.756 1.2.0 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24373.9 9.0.0-preview* 3.3.4 From 03aa7fcf331f960401af9c2ad67db80842a1b8b3 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 25 Jul 2024 22:17:07 +0100 Subject: [PATCH 03/17] Update sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37f8ab646bcf..037ef22ff197 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/sdk - e23d1d49eae1c44585cd5840a7412471498fc8c4 + 3d74f478e507a6c6de362f392596f0e497822395 - + https://github.com/dotnet/runtime - 1f70f0cc663b5d45f77840e9728386e5fa7944f9 + eedf30ebac80ca81b88c4c452614522a5ece1b27 https://github.com/dotnet/android @@ -31,9 +31,9 @@ https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal - + https://github.com/dotnet/emsdk - 99ea0c06b84d3084d090da537080dd35d2a193cf + 75567e63c265cb0a69bb11f8024349eda83f0878 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0e88e370b7cc..100d21a0cdda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,10 +29,10 @@ 8.0.70 - 9.0.100-preview.7.24374.2 + 9.0.100-preview.7.24375.7 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24366.18 + 9.0.0-preview.7.24374.12 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) @@ -59,7 +59,7 @@ 8.0.148 - 9.0.0-preview.7.24365.1 + 9.0.0-preview.7.24373.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 1.5.240627000 From 5232f25df56dd00dc6398b3aa97e5df68532158c Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 26 Jul 2024 12:26:46 +0100 Subject: [PATCH 04/17] Update preview7 packages --- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++++---------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 037ef22ff197..15e252890b87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 3d74f478e507a6c6de362f392596f0e497822395 + 9a99a3bf325e427373470965b069b0970c1a7eab https://github.com/dotnet/runtime @@ -35,105 +35,105 @@ https://github.com/dotnet/emsdk 75567e63c265cb0a69bb11f8024349eda83f0878 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 - + https://github.com/dotnet/aspnetcore - fba8bd53f16f4c908c108017f1de93cacb8d6675 + d15516bc3bd4fb321e0d0d92206113bd1b1e5304 https://github.com/dotnet/templating 3f4da9ced34942d83054e647f3b1d9d7dde281e8 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + eedf30ebac80ca81b88c4c452614522a5ece1b27 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 100d21a0cdda..96ea9eb57f59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 8.0.70 - 9.0.100-preview.7.24375.7 + 9.0.100-preview.7.24375.12 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24374.12 @@ -38,17 +38,17 @@ $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24374.12 35.0.0-preview.7.29 @@ -66,19 +66,19 @@ 10.0.22621.756 1.2.0 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 - 9.0.0-preview.7.24373.9 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24375.8 9.0.0-preview* 3.3.4 From 4cf9f605508cf821bd58087aa7eb673fd100d6e8 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 26 Jul 2024 09:08:02 -0500 Subject: [PATCH 05/17] dotnet/runtime 8.0.8 feeds --- NuGet.config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index eba7ff50d9a9..4b7f099d5946 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,8 +21,9 @@ - - + + + From 7ad3e315fd6c27c0c4bd34ff1536a757aaa422d5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 26 Jul 2024 16:25:52 -0500 Subject: [PATCH 06/17] Fix xamarin/xamarin-macios dependency names --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15e252890b87..f91ffab5c201 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,19 +12,19 @@ https://github.com/dotnet/android ab412a5629778598f9b33b9b976721898dbacc95 - + https://github.com/xamarin/xamarin-macios 4741d540eee2390fa075d0bdb49083cb58e43048 - + https://github.com/xamarin/xamarin-macios 4741d540eee2390fa075d0bdb49083cb58e43048 - + https://github.com/xamarin/xamarin-macios 4741d540eee2390fa075d0bdb49083cb58e43048 - + https://github.com/xamarin/xamarin-macios 4741d540eee2390fa075d0bdb49083cb58e43048 diff --git a/eng/Versions.props b/eng/Versions.props index 96ea9eb57f59..6c5df5ffd139 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 35.0.0-preview.7.29 - 17.2.9714-net9-p6 - 14.2.9714-net9-p6 - 17.2.9714-net9-p6 - 17.2.9714-net9-p6 + 17.2.9714-net9-p6 + 14.2.9714-net9-p6 + 17.2.9714-net9-p6 + 17.2.9714-net9-p6 8.0.148 @@ -148,9 +148,9 @@ $(DotNetVersionBand) 9.0.100-preview.6 9.0.100 - $(MicrosoftMacCatalystSdknet90_172PackageVersion) - $(MicrosoftmacOSSdknet90_142PackageVersion) - $(MicrosoftiOSSdknet90_172PackageVersion) - $(MicrosofttvOSSdknet90_172PackageVersion) + $(MicrosoftMacCatalystSdknet90_175PackageVersion) + $(MicrosoftmacOSSdknet90_145PackageVersion) + $(MicrosoftiOSSdknet90_175PackageVersion) + $(MicrosofttvOSSdknet90_175PackageVersion) From e1bb8bef9c7700c4d2a9cc7fba847d414b836cf5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 26 Jul 2024 16:35:28 -0500 Subject: [PATCH 07/17] darc update-dependencies --id 232964 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f91ffab5c201..6cb7d0f3bac8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/dotnet/android ab412a5629778598f9b33b9b976721898dbacc95 - + https://github.com/xamarin/xamarin-macios - 4741d540eee2390fa075d0bdb49083cb58e43048 + efc58d2bcd7bc1eb8ae093b39a1af2030702a093 - + https://github.com/xamarin/xamarin-macios - 4741d540eee2390fa075d0bdb49083cb58e43048 + efc58d2bcd7bc1eb8ae093b39a1af2030702a093 - + https://github.com/xamarin/xamarin-macios - 4741d540eee2390fa075d0bdb49083cb58e43048 + efc58d2bcd7bc1eb8ae093b39a1af2030702a093 - + https://github.com/xamarin/xamarin-macios - 4741d540eee2390fa075d0bdb49083cb58e43048 + efc58d2bcd7bc1eb8ae093b39a1af2030702a093 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 6c5df5ffd139..0afbfd1f7980 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 35.0.0-preview.7.29 - 17.2.9714-net9-p6 - 14.2.9714-net9-p6 - 17.2.9714-net9-p6 - 17.2.9714-net9-p6 + 17.5.9212-net9-p7 + 14.5.9212-net9-p7 + 17.5.9212-net9-p7 + 17.5.9212-net9-p7 8.0.148 From bb0973af01a12b3f2e9f543c4cafcd8031490d26 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 26 Jul 2024 16:35:56 -0500 Subject: [PATCH 08/17] $(DotNetMaciOSManifestVersionBand) is preview.7 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0afbfd1f7980..fab4a0682024 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,7 +146,7 @@ $(DotNetVersionBand) $(DotNetVersionBand) $(DotNetVersionBand) - 9.0.100-preview.6 + $(DotNetVersionBand) 9.0.100 $(MicrosoftMacCatalystSdknet90_175PackageVersion) $(MicrosoftmacOSSdknet90_145PackageVersion) From 3386e79bd570a04fa0ad5aa41de814ba5b5d3ef5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 26 Jul 2024 16:45:00 -0500 Subject: [PATCH 09/17] $(NoWarn) CS0618, for Blazor scenarios D:\a\_work\1\s\artifacts\obj\Maui.Controls.Sample\Release\net9.0\Microsoft.CodeAnalysis.Razor.Compiler\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Main_razor.g.cs(81,55): error CS0618: 'Router.PreferExactMatches' is obsolete: 'This property is obsolete and configuring it has not effect.' [D:\a\_work\1\s\src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj::TargetFramework=net9.0] D:\a\_work\1\s\artifacts\obj\Maui.Controls.Sample\Release\net9.0-maccatalyst\maccatalyst-x64\Microsoft.CodeAnalysis.Razor.Compiler\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Main_razor.g.cs(81,55): error CS0618: 'Router.PreferExactMatches' is obsolete: 'This property is obsolete and configuring it has not effect.' [D:\a\_work\1\s\src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj::TargetFramework=net9.0-maccatalyst] D:\a\_work\1\s\artifacts\obj\Maui.Controls.Sample\Release\net9.0-android\Microsoft.CodeAnalysis.Razor.Compiler\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Main_razor.g.cs(81,55): error CS0618: 'Router.PreferExactMatches' is obsolete: 'This property is obsolete and configuring it has not effect.' [D:\a\_work\1\s\src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj::TargetFramework=net9.0-android] D:\a\_work\1\s\artifacts\obj\Maui.Controls.Sample\Release\net9.0-tizen\Microsoft.CodeAnalysis.Razor.Compiler\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Main_razor.g.cs(81,55): error CS0618: 'Router.PreferExactMatches' is obsolete: 'This property is obsolete and configuring it has not effect.' [D:\a\_work\1\s\src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj::TargetFramework=net9.0-tizen] D:\a\_work\1\s\artifacts\obj\Maui.Controls.Sample\Release\net9.0-ios\iossimulator-x64\Microsoft.CodeAnalysis.Razor.Compiler\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Main_razor.g.cs(81,55): error CS0618: 'Router.PreferExactMatches' is obsolete: 'This property is obsolete and configuring it has not effect.' [D:\a\_work\1\s\src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj::TargetFramework=net9.0-ios] D:\a\_work\1\s\artifacts\obj\Maui.Controls.Sample\Release\net9.0-windows10.0.20348\win10-x64\intermediatexaml\Microsoft.CodeAnalysis.Razor.Compiler\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Main_razor.g.cs(81,55): error CS0618: 'Router.PreferExactMatches' is obsolete: 'This property is obsolete and configuring it has not effect.' [D:\a\_work\1\s\src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj::TargetFramework=net9.0-windows10.0.20348] D:\a\_work\1\s\artifacts\obj\Maui.Controls.Sample\Release\net9.0-windows10.0.19041\win10-x64\intermediatexaml\Microsoft.CodeAnalysis.Razor.Compiler\Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator\Main_razor.g.cs(81,55): error CS0618: 'Router.PreferExactMatches' is obsolete: 'This property is obsolete and configuring it has not effect.' [D:\a\_work\1\s\src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj::TargetFramework=net9.0-windows10.0.19041] 388 Warning(s) 7 Error(s) --- .../samples/Controls.Sample/Maui.Controls.Sample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index ebf4fca2e869..e7da8c59979c 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -9,7 +9,7 @@ Maui.Controls.Sample Maui.Controls.Sample false - $(NoWarn),CA1416 + $(NoWarn);CA1416;CS0618 enable maccatalyst-x64 From f24a27ffa5d9b0d9d4a7a0bfdc2fa91e8dc72699 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 26 Jul 2024 17:00:51 -0500 Subject: [PATCH 10/17] Ignore Apple API changes These are marked obsolete, but they likely "still work" for now: /Users/builder/azdo/_work/1/s/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs(146,4): error CA1422: This call site is reachable on: 'MacCatalyst' 15.0 and later. 'NetworkReachability.Schedule(CFRunLoop, string)' is obsoleted on: 'maccatalyst' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-maccatalyst] /Users/builder/azdo/_work/1/s/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs(154,4): error CA1422: This call site is reachable on: 'MacCatalyst' 15.0 and later. 'NetworkReachability.SetNotification(NetworkReachability.Notification)' is obsoleted on: 'maccatalyst' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-maccatalyst] /Users/builder/azdo/_work/1/s/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs(145,4): error CA1422: This call site is reachable on: 'MacCatalyst' 15.0 and later. 'NetworkReachability.SetNotification(NetworkReachability.Notification)' is obsoleted on: 'maccatalyst' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-maccatalyst] /Users/builder/azdo/_work/1/s/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs(155,4): error CA1422: This call site is reachable on: 'MacCatalyst' 15.0 and later. 'NetworkReachability.Schedule(CFRunLoop, string)' is obsoleted on: 'maccatalyst' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-maccatalyst] /Users/builder/azdo/_work/1/s/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs(75,11): error CA1422: This call site is reachable on: 'MacCatalyst' 12.0 and later. 'ASWebAuthenticationSession' is obsoleted on: 'maccatalyst' 17.4 and later (Use the 'ASWebAuthenticationSessionCallback' overload instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-maccatalyst] /Users/builder/azdo/_work/1/s/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs(32,17): error CA1422: This call site is reachable on: 'MacCatalyst' 15.0 and later. 'UIImpactFeedbackGenerator' is obsoleted on: 'maccatalyst' 17.5 and later (Use 'GetFeedbackGenerator' method instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-maccatalyst] /Users/builder/azdo/_work/1/s/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs(24,17): error CA1422: This call site is reachable on: 'MacCatalyst' 15.0 and later. 'UIImpactFeedbackGenerator' is obsoleted on: 'maccatalyst' 17.5 and later (Use 'GetFeedbackGenerator' method instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-maccatalyst] /Users/builder/azdo/_work/1/s/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs(155,4): error CA1422: This call site is reachable on: 'iOS' 13.0 and later, 'maccatalyst' 13.0 and later. 'NetworkReachability.Schedule(CFRunLoop, string)' is obsoleted on: 'ios' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.), 'maccatalyst' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-ios] /Users/builder/azdo/_work/1/s/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs(154,4): error CA1422: This call site is reachable on: 'iOS' 13.0 and later, 'maccatalyst' 13.0 and later. 'NetworkReachability.SetNotification(NetworkReachability.Notification)' is obsoleted on: 'ios' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.), 'maccatalyst' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-ios] /Users/builder/azdo/_work/1/s/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs(145,4): error CA1422: This call site is reachable on: 'iOS' 13.0 and later, 'maccatalyst' 13.0 and later. 'NetworkReachability.SetNotification(NetworkReachability.Notification)' is obsoleted on: 'ios' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.), 'maccatalyst' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-ios] /Users/builder/azdo/_work/1/s/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs(146,4): error CA1422: This call site is reachable on: 'iOS' 13.0 and later, 'maccatalyst' 13.0 and later. 'NetworkReachability.Schedule(CFRunLoop, string)' is obsoleted on: 'ios' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.), 'maccatalyst' 17.4 and later (Use 'NSUrlSession' or 'NWConnection' instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-ios] /Users/builder/azdo/_work/1/s/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs(24,17): error CA1422: This call site is reachable on: 'iOS' 13.0 and later, 'maccatalyst' 13.0 and later. 'UIImpactFeedbackGenerator' is obsoleted on: 'ios' 17.5 and later (Use 'GetFeedbackGenerator' method instead.), 'maccatalyst' 17.5 and later (Use 'GetFeedbackGenerator' method instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-ios] /Users/builder/azdo/_work/1/s/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs(32,17): error CA1422: This call site is reachable on: 'iOS' 13.0 and later, 'maccatalyst' 13.0 and later. 'UIImpactFeedbackGenerator' is obsoleted on: 'ios' 17.5 and later (Use 'GetFeedbackGenerator' method instead.), 'maccatalyst' 17.5 and later (Use 'GetFeedbackGenerator' method instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-ios] /Users/builder/azdo/_work/1/s/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs(75,11): error CA1422: This call site is reachable on: 'iOS' 12.0 and later, 'maccatalyst' 13.0 and later. 'ASWebAuthenticationSession' is obsoleted on: 'ios' 17.4 and later (Use the 'ASWebAuthenticationSessionCallback' overload instead.), 'maccatalyst' 17.4 and later (Use the 'ASWebAuthenticationSessionCallback' overload instead.). (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1422) [/Users/builder/azdo/_work/1/s/src/Essentials/src/Essentials.csproj::TargetFramework=net9.0-ios] 0 Warning(s) 14 Error(s) --- .../Connectivity/Connectivity.ios.tvos.macos.reachability.cs | 4 ++++ src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs | 2 ++ .../src/WebAuthenticator/WebAuthenticator.ios.tvos.cs | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs index 291b736b0b03..156dd4a8f615 100644 --- a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs +++ b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs @@ -143,7 +143,9 @@ internal ReachabilityListener() var ip = new IPAddress(0); defaultRouteReachability = new NetworkReachability(ip); defaultRouteReachability.SetNotification(OnChange); +#pragma warning disable CA1422 // obsolete in MacCatalyst 15, iOS 13 defaultRouteReachability.Schedule(CFRunLoop.Main, CFRunLoop.ModeDefault); +#pragma warning restore CA1422 remoteHostReachability = new NetworkReachability(Reachability.HostName); @@ -151,8 +153,10 @@ internal ReachabilityListener() // this only happens when you create NetworkReachability from a hostname remoteHostReachability.TryGetFlags(out var flags); +#pragma warning disable CA1422 // obsolete in MacCatalyst 15, iOS 13 remoteHostReachability.SetNotification(OnChange); remoteHostReachability.Schedule(CFRunLoop.Main, CFRunLoop.ModeDefault); +#pragma warning restore CA1422 #if !(MACCATALYST || MACOS) #pragma warning disable BI1234, CA1416 // Analyzer bug https://github.com/dotnet/roslyn-analyzers/issues/5938 diff --git a/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs b/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs index f453f11540c2..244e4c30ef89 100644 --- a/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs +++ b/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs @@ -21,7 +21,9 @@ public void Perform(HapticFeedbackType type) void Click() { +#pragma warning disable CA1422 // obsolete in MacCatalyst 13, iOS 13 var impact = new UIImpactFeedbackGenerator(UIImpactFeedbackStyle.Light); +#pragma warning restore CA1422 impact.Prepare(); impact.ImpactOccurred(); impact.Dispose(); diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs index 81169504e050..742f3098e2ba 100644 --- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs +++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs @@ -72,7 +72,9 @@ void AuthSessionCallback(NSUrl cbUrl, NSError error) if (OperatingSystem.IsIOSVersionAtLeast(12)) { +#pragma warning disable CA1422 // obsolete in MacCatalyst 13, iOS 12 was = new ASWebAuthenticationSession(WebUtils.GetNativeUrl(url), scheme, AuthSessionCallback); +#pragma warning restore CA1422 if (OperatingSystem.IsIOSVersionAtLeast(13)) { From 0f35b9da1218a0aa6e5e16ae8a74d892169460bd Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 26 Jul 2024 17:05:41 -0500 Subject: [PATCH 11/17] Two more Apple API changes --- .../Connectivity/Connectivity.ios.tvos.macos.reachability.cs | 2 +- src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs index 156dd4a8f615..a95367b74c72 100644 --- a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs +++ b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs @@ -142,8 +142,8 @@ internal ReachabilityListener() { var ip = new IPAddress(0); defaultRouteReachability = new NetworkReachability(ip); - defaultRouteReachability.SetNotification(OnChange); #pragma warning disable CA1422 // obsolete in MacCatalyst 15, iOS 13 + defaultRouteReachability.SetNotification(OnChange); defaultRouteReachability.Schedule(CFRunLoop.Main, CFRunLoop.ModeDefault); #pragma warning restore CA1422 diff --git a/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs b/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs index 244e4c30ef89..27a2c947cc46 100644 --- a/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs +++ b/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs @@ -31,7 +31,9 @@ void Click() void LongPress() { +#pragma warning disable CA1422 // obsolete in MacCatalyst 13, iOS 13 var impact = new UIImpactFeedbackGenerator(UIImpactFeedbackStyle.Medium); +#pragma warning restore CA1422 impact.Prepare(); impact.ImpactOccurred(); impact.Dispose(); From 395d3bc6d8498923be5627044d6d99128f04afa2 Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Sat, 27 Jul 2024 12:09:42 -0400 Subject: [PATCH 12/17] use branded macios net9.0p7 versions --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cb7d0f3bac8..54ae009a9537 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/dotnet/android ab412a5629778598f9b33b9b976721898dbacc95 - + https://github.com/xamarin/xamarin-macios - efc58d2bcd7bc1eb8ae093b39a1af2030702a093 + 79685c2ea57cc1b803175af5119dde8a04ec5577 - + https://github.com/xamarin/xamarin-macios - efc58d2bcd7bc1eb8ae093b39a1af2030702a093 + 79685c2ea57cc1b803175af5119dde8a04ec5577 - + https://github.com/xamarin/xamarin-macios - efc58d2bcd7bc1eb8ae093b39a1af2030702a093 + 79685c2ea57cc1b803175af5119dde8a04ec5577 - + https://github.com/xamarin/xamarin-macios - efc58d2bcd7bc1eb8ae093b39a1af2030702a093 + 79685c2ea57cc1b803175af5119dde8a04ec5577 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index fab4a0682024..a6a8d693c0c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 35.0.0-preview.7.29 - 17.5.9212-net9-p7 - 14.5.9212-net9-p7 - 17.5.9212-net9-p7 - 17.5.9212-net9-p7 + 17.5.9216-net9-p7 + 14.5.9216-net9-p7 + 17.5.9216-net9-p7 + 17.5.9216-net9-p7 8.0.148 From bf5e0c07218e1216ae5920740c2368108ba0bda2 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 29 Jul 2024 11:15:20 +0100 Subject: [PATCH 13/17] Update sdk and android --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54ae009a9537..730fc1b4c826 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/sdk - 9a99a3bf325e427373470965b069b0970c1a7eab + b02a3882ad7fbcc1b098833edec5fc2f54591144 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/android - ab412a5629778598f9b33b9b976721898dbacc95 + 0f68e068519bcc9509be88037501f77593222e73 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index a6a8d693c0c0..057b5fca5171 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,10 +29,10 @@ 8.0.70 - 9.0.100-preview.7.24375.12 + 9.0.100-preview.7.24378.4 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24376.15 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) @@ -50,7 +50,7 @@ 9.0.0-preview.7.24374.12 9.0.0-preview.7.24374.12 - 35.0.0-preview.7.29 + 35.0.0-preview.7.34 17.5.9216-net9-p7 14.5.9216-net9-p7 From afa5371fa41ebaafed16a478bdf6ecbfe6b16a48 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 29 Jul 2024 19:15:40 +0100 Subject: [PATCH 14/17] Update macios version --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 730fc1b4c826..a87e53621bd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/dotnet/android 0f68e068519bcc9509be88037501f77593222e73 - + https://github.com/xamarin/xamarin-macios - 79685c2ea57cc1b803175af5119dde8a04ec5577 + 89556aff7041de9a4f27e754df82bce7a104c2d5 - + https://github.com/xamarin/xamarin-macios - 79685c2ea57cc1b803175af5119dde8a04ec5577 + 89556aff7041de9a4f27e754df82bce7a104c2d5 - + https://github.com/xamarin/xamarin-macios - 79685c2ea57cc1b803175af5119dde8a04ec5577 + 89556aff7041de9a4f27e754df82bce7a104c2d5 - + https://github.com/xamarin/xamarin-macios - 79685c2ea57cc1b803175af5119dde8a04ec5577 + 89556aff7041de9a4f27e754df82bce7a104c2d5 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 057b5fca5171..77e0c9218758 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 35.0.0-preview.7.34 - 17.5.9216-net9-p7 - 14.5.9216-net9-p7 - 17.5.9216-net9-p7 - 17.5.9216-net9-p7 + 17.5.9217-net9-p7 + 14.5.9217-net9-p7 + 17.5.9217-net9-p7 + 17.5.9217-net9-p7 8.0.148 From 10a75cba39de7df580740b1d82874c380dfcb76d Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 30 Jul 2024 14:23:41 +0100 Subject: [PATCH 15/17] Update to sdk in validation and aspnet --- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++++---------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a87e53621bd3..3dd4315fd3c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - b02a3882ad7fbcc1b098833edec5fc2f54591144 + 812e813ae9785966b854002d35507c123c858ced https://github.com/dotnet/runtime @@ -35,105 +35,105 @@ https://github.com/dotnet/emsdk 75567e63c265cb0a69bb11f8024349eda83f0878 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - d15516bc3bd4fb321e0d0d92206113bd1b1e5304 + 41a338d8befba633f5349a0344842ae1a9211817 https://github.com/dotnet/templating 3f4da9ced34942d83054e647f3b1d9d7dde281e8 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - eedf30ebac80ca81b88c4c452614522a5ece1b27 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 77e0c9218758..c9eaf691ce59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 8.0.70 - 9.0.100-preview.7.24378.4 + 9.0.100-preview.7.24379.15 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24376.15 @@ -38,17 +38,17 @@ $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 - 9.0.0-preview.7.24374.12 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 35.0.0-preview.7.34 @@ -66,19 +66,19 @@ 10.0.22621.756 1.2.0 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 - 9.0.0-preview.7.24375.8 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 9.0.0-preview* 3.3.4 From fd1ef50320686ffaf943b3b5bf108ee4a71af56f Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 30 Jul 2024 16:32:12 +0100 Subject: [PATCH 16/17] Update iOS --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dd4315fd3c7..f4832412ea9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/dotnet/android 0f68e068519bcc9509be88037501f77593222e73 - + https://github.com/xamarin/xamarin-macios - 89556aff7041de9a4f27e754df82bce7a104c2d5 + 0eed6bd305b1f4a0b58b01886988ce9777a6e9b9 - + https://github.com/xamarin/xamarin-macios - 89556aff7041de9a4f27e754df82bce7a104c2d5 + 0eed6bd305b1f4a0b58b01886988ce9777a6e9b9 - + https://github.com/xamarin/xamarin-macios - 89556aff7041de9a4f27e754df82bce7a104c2d5 + 0eed6bd305b1f4a0b58b01886988ce9777a6e9b9 - + https://github.com/xamarin/xamarin-macios - 89556aff7041de9a4f27e754df82bce7a104c2d5 + 0eed6bd305b1f4a0b58b01886988ce9777a6e9b9 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index c9eaf691ce59..902bf7e317b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 35.0.0-preview.7.34 - 17.5.9217-net9-p7 - 14.5.9217-net9-p7 - 17.5.9217-net9-p7 - 17.5.9217-net9-p7 + 17.5.9219-net9-p7 + 14.5.9219-net9-p7 + 17.5.9219-net9-p7 + 17.5.9219-net9-p7 8.0.148 From dab65ec3add56f49cce8e4b26a9a5492ca8acb40 Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Tue, 30 Jul 2024 18:45:23 -0400 Subject: [PATCH 17/17] Bump macios --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4832412ea9a..bf6e7d887636 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/dotnet/android 0f68e068519bcc9509be88037501f77593222e73 - + https://github.com/xamarin/xamarin-macios - 0eed6bd305b1f4a0b58b01886988ce9777a6e9b9 + f6a32320a02128b551f1e417b46c28a2722a6479 - + https://github.com/xamarin/xamarin-macios - 0eed6bd305b1f4a0b58b01886988ce9777a6e9b9 + f6a32320a02128b551f1e417b46c28a2722a6479 - + https://github.com/xamarin/xamarin-macios - 0eed6bd305b1f4a0b58b01886988ce9777a6e9b9 + f6a32320a02128b551f1e417b46c28a2722a6479 - + https://github.com/xamarin/xamarin-macios - 0eed6bd305b1f4a0b58b01886988ce9777a6e9b9 + f6a32320a02128b551f1e417b46c28a2722a6479 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 902bf7e317b2..4be4054af0b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 35.0.0-preview.7.34 - 17.5.9219-net9-p7 - 14.5.9219-net9-p7 - 17.5.9219-net9-p7 - 17.5.9219-net9-p7 + 17.5.9220-net9-p7 + 14.5.9220-net9-p7 + 17.5.9220-net9-p7 + 17.5.9220-net9-p7 8.0.148