Merge remote-tracking branch 'origin/main' into bump-main-in-net8.0-2…

…022-12-21

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=,

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:

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 @@
 		$< > [email protected]
 	$(Q) if ! diff $@ [email protected] >/dev/null; then $(CP) [email protected] $@; 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" \

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";
 

tools/common/SdkVersions.cs.in → 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}");
 			}
 		}
 	}

tools/dotnet-linker/dotnet-linker.csproj

@@ -280,7 +280,7 @@
       <ManifestResourceName>Xamarin.Bundler.Errors.zh-Hant</ManifestResourceName>
     </EmbeddedResource>
   </ItemGroup>
-  <Target Name="BuildSdkVersions" Inputs="../common/SdkVersions.cs.in;../common/ProductConstants.cs.in" Outputs="../common/SdkVersions.cs;../common/ProductConstants.cs">
+  <Target Name="BuildSdkVersions" Inputs="../common/SdkVersions.in.cs;../common/ProductConstants.in.cs" Outputs="../common/SdkVersions.cs;../common/ProductConstants.cs">
     <Exec Command="make ../common/SdkVersions.cs ../common/ProductConstants.cs" />
   </Target>
 </Project>

tools/mmp/mmp.csproj

@@ -568,7 +568,7 @@
       <Link>docs\website\mmp-errors.md</Link>
     </None>
   </ItemGroup>
-  <Target Name="BuildSdkVersions" Inputs="../common/SdkVersions.cs.in;../common/ProductConstants.cs.in" Outputs="../common/SdkVersions.cs;../common/ProductConstants.cs">
+  <Target Name="BuildSdkVersions" Inputs="../common/SdkVersions.in.cs;../common/ProductConstants.in.cs" Outputs="../common/SdkVersions.cs;../common/ProductConstants.cs">
     <Exec Command="make ../common/SdkVersions.cs ../common/ProductConstants.cs" />
   </Target>
 </Project>

tools/mtouch/mtouch.csproj

@@ -585,7 +585,7 @@
       <ManifestResourceName>Xamarin.Bundler.Errors.zh-Hant</ManifestResourceName>
     </EmbeddedResource>
   </ItemGroup>
-  <Target Name="BuildSdkVersions" Inputs="../common/SdkVersions.cs.in;../common/ProductConstants.cs.in" Outputs="../common/SdkVersions.cs;../common/ProductConstants.cs">
+  <Target Name="BuildSdkVersions" Inputs="../common/SdkVersions.in.cs;../common/ProductConstants.in.cs" Outputs="../common/SdkVersions.cs;../common/ProductConstants.cs">
     <Exec Command="make ../common/SdkVersions.cs ../common/ProductConstants.cs" />
   </Target>
   <Target Name="AfterBuild">