From 08b5c69b16b102b4a585beda2f040122142057d4 Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Tue, 29 Oct 2024 08:06:35 -0400 Subject: [PATCH 1/3] [main] Bump to the upcoming stable release versions of the SDKs --- Make.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Make.config b/Make.config index 1991abdcf722..2454b4a83213 100644 --- a/Make.config +++ b/Make.config @@ -44,10 +44,10 @@ include $(TOP)/Make.versions # The value is taken from the name + version of the Ref pack. # Example: given the Ref pack "Microsoft.iOS.Ref.net8.0_17.5" with the version "17.5.8030", the value # to write here would be the part after "Microsoft.iOS.Ref." + "/" + version: "net8.0_17.5/17.5.8030" -STABLE_NUGET_VERSION_iOS=net8.0_18.0/18.0.8303 -STABLE_NUGET_VERSION_tvOS=net8.0_18.0/18.0.8303 -STABLE_NUGET_VERSION_MacCatalyst=net8.0_18.0/18.0.8303 -STABLE_NUGET_VERSION_macOS=net8.0_15.0/15.0.8303 +STABLE_NUGET_VERSION_iOS=net9.0_18.0/18.0.9615 +STABLE_NUGET_VERSION_tvOS=net9.0_18.0/18.0.9615 +STABLE_NUGET_VERSION_MacCatalyst=net9.0_18.0/18.0.9615 +STABLE_NUGET_VERSION_macOS=net9.0_15.0/15.0.9615 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c686fcea214a..9ec770d9b035 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,21 +31,21 @@ 9c9443396f8deacceb8edb169890e52aac25f311 - + https://github.com/xamarin/xamarin-macios - a8d7eab24d26b7d2b75dee10a219fa0312f600f2 + 8354d6d971c635925ef7b26da8b04305b5b3035a - + https://github.com/xamarin/xamarin-macios - a8d7eab24d26b7d2b75dee10a219fa0312f600f2 + 8354d6d971c635925ef7b26da8b04305b5b3035a - + https://github.com/xamarin/xamarin-macios - a8d7eab24d26b7d2b75dee10a219fa0312f600f2 + 8354d6d971c635925ef7b26da8b04305b5b3035a - + https://github.com/xamarin/xamarin-macios - a8d7eab24d26b7d2b75dee10a219fa0312f600f2 + 8354d6d971c635925ef7b26da8b04305b5b3035a @@ -69,21 +69,21 @@ 9bff9c5017d8444fdf76959c112dd9fed2da9317 - + https://github.com/xamarin/xamarin-macios - 2f3ae2492519571ccf3f7280dfca232e42b5ada2 + d9f2854558b9aa6549e7d3064e5c1bdfa55a18cf - + https://github.com/xamarin/xamarin-macios - 2f3ae2492519571ccf3f7280dfca232e42b5ada2 + d9f2854558b9aa6549e7d3064e5c1bdfa55a18cf - + https://github.com/xamarin/xamarin-macios - 2f3ae2492519571ccf3f7280dfca232e42b5ada2 + d9f2854558b9aa6549e7d3064e5c1bdfa55a18cf - + https://github.com/xamarin/xamarin-macios - 2f3ae2492519571ccf3f7280dfca232e42b5ada2 + d9f2854558b9aa6549e7d3064e5c1bdfa55a18cf diff --git a/eng/Versions.props b/eng/Versions.props index f72d539d0053..41a4b3886a4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,19 +19,19 @@ $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version) $(MicrosoftNETSdkPackageVersion) - 18.0.8303 - 15.0.8303 - 18.0.8303 - 18.0.8303 + 18.0.8314 + 15.0.8314 + 18.0.8314 + 18.0.8314 17.0.8523 14.0.8523 17.0.8523 17.0.8523 - 18.0.9606-net9-rtm - 15.0.9606-net9-rtm - 18.0.9606-net9-rtm - 18.0.9606-net9-rtm + 18.0.9615 + 15.0.9615 + 18.0.9615 + 18.0.9615 From 647916bd6de69ede2e24ef047146e00ad71b4e57 Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Tue, 29 Oct 2024 09:02:24 -0400 Subject: [PATCH 2/3] Add nuget feeds --- NuGet.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 8023cacf4c21..78d78a512770 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,8 @@ - + + From 93a5dd5a66b53f9b573361721d682909eca575ec Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Tue, 5 Nov 2024 12:03:05 -0500 Subject: [PATCH 3/3] Bump to blessed versions --- Make.config | 8 ++++---- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Make.config b/Make.config index 2454b4a83213..48b02a54aabf 100644 --- a/Make.config +++ b/Make.config @@ -44,10 +44,10 @@ include $(TOP)/Make.versions # The value is taken from the name + version of the Ref pack. # Example: given the Ref pack "Microsoft.iOS.Ref.net8.0_17.5" with the version "17.5.8030", the value # to write here would be the part after "Microsoft.iOS.Ref." + "/" + version: "net8.0_17.5/17.5.8030" -STABLE_NUGET_VERSION_iOS=net9.0_18.0/18.0.9615 -STABLE_NUGET_VERSION_tvOS=net9.0_18.0/18.0.9615 -STABLE_NUGET_VERSION_MacCatalyst=net9.0_18.0/18.0.9615 -STABLE_NUGET_VERSION_macOS=net9.0_15.0/15.0.9615 +STABLE_NUGET_VERSION_iOS=net9.0_18.0/18.0.9617 +STABLE_NUGET_VERSION_tvOS=net9.0_18.0/18.0.9617 +STABLE_NUGET_VERSION_MacCatalyst=net9.0_18.0/18.0.9617 +STABLE_NUGET_VERSION_macOS=net9.0_15.0/15.0.9617 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD) diff --git a/NuGet.config b/NuGet.config index 78d78a512770..7148c058f2d1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae16725e6f5e..2c1aa8cbf3b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,21 +69,21 @@ 9bff9c5017d8444fdf76959c112dd9fed2da9317 - + https://github.com/xamarin/xamarin-macios - d9f2854558b9aa6549e7d3064e5c1bdfa55a18cf + 797d30720e5e629d23eb146935da94cb1b61047e - + https://github.com/xamarin/xamarin-macios - d9f2854558b9aa6549e7d3064e5c1bdfa55a18cf + 797d30720e5e629d23eb146935da94cb1b61047e - + https://github.com/xamarin/xamarin-macios - d9f2854558b9aa6549e7d3064e5c1bdfa55a18cf + 797d30720e5e629d23eb146935da94cb1b61047e - + https://github.com/xamarin/xamarin-macios - d9f2854558b9aa6549e7d3064e5c1bdfa55a18cf + 797d30720e5e629d23eb146935da94cb1b61047e diff --git a/eng/Versions.props b/eng/Versions.props index 801124fc4503..aee66132d185 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,9 +29,9 @@ 17.0.8523 17.0.8523 - 18.0.9615 - 15.0.9615 - 18.0.9615 - 18.0.9615 + 18.0.9617 + 15.0.9617 + 18.0.9617 + 18.0.9617