From 6c04f7621a4fd96aa2a79a27e9b03136b0a056a2 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 21 Dec 2022 17:44:27 +0100 Subject: [PATCH] [tools] Update SdkVersions.cs after the latest Xcode 14.2 bump. (#17101) * Update `SdkVersions.cs` after the latest Xcode 14.2 bump. * Rename `[SdkVersions|ProductConstants].cs.in` to `[SdkVersions|ProductConstants].in.cs`. This way the autoformatter makes sure it's formatted correctly. --- src/Makefile | 2 +- tests/Makefile | 2 +- tools/common/Make.common | 4 ++-- ...oductConstants.cs.in => ProductConstants.in.cs} | 0 tools/common/SdkVersions.cs | 14 +++++++------- .../{SdkVersions.cs.in => SdkVersions.in.cs} | 4 ++-- tools/dotnet-linker/dotnet-linker.csproj | 2 +- tools/mmp/mmp.csproj | 2 +- tools/mtouch/mtouch.csproj | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename tools/common/{ProductConstants.cs.in => ProductConstants.in.cs} (100%) rename tools/common/{SdkVersions.cs.in => SdkVersions.in.cs} (97%) diff --git a/src/Makefile b/src/Makefile index 4cb82488e8fd..65181ba9418d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1638,7 +1638,7 @@ endif project-files: $(PROJECT_FILES) -$(TOP)/tools/common/SdkVersions.cs: $(TOP)/tools/common/SdkVersions.cs.in +$(TOP)/tools/common/SdkVersions.cs: $(TOP)/tools/common/SdkVersions.in.cs @$(MAKE) -C $(TOP)/tools/mtouch ../common/SdkVersions.cs COMMA=, diff --git a/tests/Makefile b/tests/Makefile index f39aef673c75..6c199ea4dbd5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -181,7 +181,7 @@ build-test-libraries: all-local:: .stamp-xharness-configure -$(TOP)/tools/common/SdkVersions.cs: $(TOP)/tools/common/SdkVersions.cs.in +$(TOP)/tools/common/SdkVersions.cs: $(TOP)/tools/common/SdkVersions.in.cs @$(MAKE) -C $(TOP)/tools/mtouch ../common/SdkVersions.cs .stamp-src-project-files: diff --git a/tools/common/Make.common b/tools/common/Make.common index 76425af54c3f..a175df4892d3 100644 --- a/tools/common/Make.common +++ b/tools/common/Make.common @@ -1,6 +1,6 @@ # We check in SdkVersions.cs so that it's easier to use this file when building tests on Windows. -../common/SdkVersions.cs: ../common/SdkVersions.cs.in Makefile $(TOP)/Make.config +../common/SdkVersions.cs: ../common/SdkVersions.in.cs Makefile $(TOP)/Make.config $(Q_GEN) sed \ -e 's/@IOS_SDK_VERSION@/$(IOS_SDK_VERSION)/g' -e 's/@WATCHOS_SDK_VERSION@/$(WATCH_SDK_VERSION)/' -e 's/@TVOS_SDK_VERSION@/$(TVOS_SDK_VERSION)/' -e 's/@MACOS_SDK_VERSION@/$(MACOS_SDK_VERSION)/' \ -e 's/@MACCATALYST_SDK_VERSION@/$(MACCATALYST_SDK_VERSION)/g' \ @@ -59,7 +59,7 @@ $< > $@.tmp $(Q) if ! diff $@ $@.tmp >/dev/null; then $(CP) $@.tmp $@; echo "The file $(TOP)/tools/common/SdkVersions.cs has been automatically re-generated; please commit the changes."; fi -../common/ProductConstants.cs: ../common/ProductConstants.cs.in Makefile $(TOP)/Make.config +../common/ProductConstants.cs: ../common/ProductConstants.in.cs Makefile $(TOP)/Make.config $(Q_GEN) sed \ -e "s/@IOS_VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \ -e "s/@TVOS_VERSION@/$(IOS_PACKAGE_VERSION_MAJOR).$(IOS_PACKAGE_VERSION_MINOR).$(IOS_PACKAGE_VERSION_REV)/g" \ diff --git a/tools/common/ProductConstants.cs.in b/tools/common/ProductConstants.in.cs similarity index 100% rename from tools/common/ProductConstants.cs.in rename to tools/common/ProductConstants.in.cs diff --git a/tools/common/SdkVersions.cs b/tools/common/SdkVersions.cs index 67ef8b2e8950..f99ea8eb1b78 100644 --- a/tools/common/SdkVersions.cs +++ b/tools/common/SdkVersions.cs @@ -14,12 +14,12 @@ namespace Xamarin { static class SdkVersions { - public const string Xcode = "14.1"; - public const string OSX = "13.0"; - public const string iOS = "16.1"; + public const string Xcode = "14.2"; + public const string OSX = "13.1"; + public const string iOS = "16.2"; public const string WatchOS = "9.1"; public const string TVOS = "16.1"; - public const string MacCatalyst = "16.1"; + public const string MacCatalyst = "16.2"; #if NET public const string MinOSX = "10.14"; @@ -40,12 +40,12 @@ static class SdkVersions { public const string MinWatchOSCompanionSimulator = "14.5"; public const string MinTVOSSimulator = "12.4"; - public const string MaxiOSSimulator = "16.1"; + public const string MaxiOSSimulator = "16.2"; public const string MaxWatchOSSimulator = "9.1"; - public const string MaxWatchOSCompanionSimulator = "16.1"; + public const string MaxWatchOSCompanionSimulator = "16.2"; public const string MaxTVOSSimulator = "16.1"; - public const string MaxiOSDeploymentTarget = "16.1"; + public const string MaxiOSDeploymentTarget = "16.2"; public const string MaxWatchDeploymentTarget = "9.1"; public const string MaxTVOSDeploymentTarget = "16.1"; diff --git a/tools/common/SdkVersions.cs.in b/tools/common/SdkVersions.in.cs similarity index 97% rename from tools/common/SdkVersions.cs.in rename to tools/common/SdkVersions.in.cs index 9bbb79d1374c..e2af8785eb15 100644 --- a/tools/common/SdkVersions.cs.in +++ b/tools/common/SdkVersions.in.cs @@ -131,7 +131,7 @@ public static Version GetVersion (ApplePlatform platform) case ApplePlatform.TVOS: return TVOSVersion; case ApplePlatform.MacCatalyst: return MacCatalystVersion; default: - throw new ArgumentOutOfRangeException(nameof(platform), platform, $"Unknown platform: {platform}"); + throw new ArgumentOutOfRangeException (nameof (platform), platform, $"Unknown platform: {platform}"); } } @@ -144,7 +144,7 @@ public static Version GetMinVersion (ApplePlatform platform) case ApplePlatform.TVOS: return MinTVOSVersion; case ApplePlatform.MacCatalyst: return MinMacCatalystVersion; default: - throw new ArgumentOutOfRangeException(nameof(platform), platform, $"Unknown platform: {platform}"); + throw new ArgumentOutOfRangeException (nameof (platform), platform, $"Unknown platform: {platform}"); } } } diff --git a/tools/dotnet-linker/dotnet-linker.csproj b/tools/dotnet-linker/dotnet-linker.csproj index fd36a7b50fe5..82bd6e36cfa7 100644 --- a/tools/dotnet-linker/dotnet-linker.csproj +++ b/tools/dotnet-linker/dotnet-linker.csproj @@ -280,7 +280,7 @@ Xamarin.Bundler.Errors.zh-Hant - + diff --git a/tools/mmp/mmp.csproj b/tools/mmp/mmp.csproj index a57d201cf247..bb00dc94bcab 100644 --- a/tools/mmp/mmp.csproj +++ b/tools/mmp/mmp.csproj @@ -568,7 +568,7 @@ docs\website\mmp-errors.md - + diff --git a/tools/mtouch/mtouch.csproj b/tools/mtouch/mtouch.csproj index 4d85abf7737f..2c7edc58f219 100644 --- a/tools/mtouch/mtouch.csproj +++ b/tools/mtouch/mtouch.csproj @@ -585,7 +585,7 @@ Xamarin.Bundler.Errors.zh-Hant - +