Merge branch 'main' into coremedia-xcode13-beta5

xamarin · Sep 23, 2021 · a952f2a · a952f2a
2 parents 1999eae + 8ba7ff3
commit a952f2a
Show file tree

Hide file tree

Showing 184 changed files with 1,886 additions and 1,593 deletions.
diff --git a/.github/workflows/label-checker.yml b/.github/workflows/label-checker.yml
@@ -17,14 +17,14 @@ jobs:
     - run: exit 0
       name: 'Monojenkins PR'
       # always happy if monojenkins
-      if: github.actor == 'vs-mobiletools-engineering-service2' || github.actor == 'github-actions[bot]'
+      if: github.actor == 'vs-mobiletools-engineering-service2' || github.actor == 'github-actions[bot] || github.actor == 'dotnet-maestro'
 
     - run: exit 1
       name: 'User PR with no labels'
-      # failure if not monojenkins and no labels
-      if: github.actor != 'vs-mobiletools-engineering-service2' && join(github.event.pull_request.labels, ',') == ''
+      # failure if not monojenkins and not dotnet-maestro and no labels
+      if: github.actor != 'vs-mobiletools-engineering-service2' && github.actor != 'dotnet-maestro' && join(github.event.pull_request.labels, ',') == ''
 
     - run: exit 0
       name: 'User PR with labels'
       # success if not monojenkins but labels
-      if: github.actor != 'vs-mobiletools-engineering-service2' && join(github.event.pull_request.labels, ',') != ''
+      if: github.actor != 'vs-mobiletools-engineering-service2' && github.actor != 'dotnet-maestro' && join(github.event.pull_request.labels, ',') != ''
diff --git a/Localize/loc/cs/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl b/Localize/loc/cs/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl
@@ -955,6 +955,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";E0188" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Could not map the iOS version {0} to a corresponding macOS version]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Nepovedlo se namapovat verzi iOS {0} na odpovídající verzi macOS.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";E7001" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Could not resolve host IPs for WiFi debugger settings.]D;]A;        ]]></Val>
@@ -1675,6 +1684,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";E7081" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The AOT compiler '{0}' does not exist.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Kompilátor AOT {0} neexistuje.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Invalid framework: {0}]]></Val>

diff --git a/Localize/loc/de/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl b/Localize/loc/de/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl
@@ -955,6 +955,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";E0188" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Could not map the iOS version {0} to a corresponding macOS version]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Die iOS-Version {0} konnte keiner entsprechenden macOS-Version zugeordnet werden]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";E7001" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Could not resolve host IPs for WiFi debugger settings.]D;]A;        ]]></Val>
@@ -1675,6 +1684,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";E7081" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The AOT compiler '{0}' does not exist.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Der AOT-Compiler „{0}“ ist nicht vorhanden.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Invalid framework: {0}]]></Val>

diff --git a/Localize/loc/ja/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl b/Localize/loc/ja/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl
@@ -955,6 +955,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";E0188" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Could not map the iOS version {0} to a corresponding macOS version]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[macOS バージョンに対応する iOS バージョン {0} にマップできません]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";E7001" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Could not resolve host IPs for WiFi debugger settings.]D;]A;        ]]></Val>
@@ -1675,6 +1684,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";E7081" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The AOT compiler '{0}' does not exist.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[AOT コンパイラ '{0}' が存在しません。]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Invalid framework: {0}]]></Val>

diff --git a/Localize/loc/ko/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl b/Localize/loc/ko/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl
@@ -955,6 +955,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";E0188" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Could not map the iOS version {0} to a corresponding macOS version]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[macOS 버전 {0}을(를) 해당 iOS 버전에 매핑할 수 없습니다.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";E7001" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Could not resolve host IPs for WiFi debugger settings.]D;]A;        ]]></Val>
@@ -1675,6 +1684,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";E7081" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[The AOT compiler '{0}' does not exist.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[AOT 컴파일러 '{0}'이(가) 없습니다.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Invalid framework: {0}]]></Val>

diff --git a/Make.config b/Make.config
@@ -75,7 +75,7 @@ endif
 
 # For release branches, modify the following variables to hardcode a version name
 # Set the NUGET_HARDCODED_PRERELEASE_IDENTIFIER variable to the prerelease identifer you want (say "preview.5." (the trailing dot is important)
-NUGET_HARDCODED_PRERELEASE_IDENTIFIER=preview.9.
+NUGET_HARDCODED_PRERELEASE_IDENTIFIER=preview.10.
 # Set the NUGET_HARDCODED_PRERELEASE_BRANCH variable to the exact name for the branch the above variable should apply to (so that any other branches won't pick it up by accident).
 # For the previous example, this would be "release/6.0.1xx-preview5"
 # When creating a release branch from main, this must be changed from "main" to the new release branch.

diff --git a/Make.versions b/Make.versions
@@ -48,8 +48,8 @@
 #   line changed in git).
 #
 
-IOS_PACKAGE_VERSION=14.99.0.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=7.99.0.$(MAC_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=15.1.0.$(IOS_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=8.1.0.$(MAC_COMMIT_DISTANCE)
 
 #
 # ** NuGet package version numbers **

diff --git a/dotnet/DefaultCompilationIncludes.md b/dotnet/DefaultCompilationIncludes.md
@@ -1,15 +1,15 @@
-# Default complication includes in iOS, tvOS, watchOS and macOS projects
+# Default complication includes in iOS, tvOS, macOS and Mac Catalyst projects
 
 Default compilation includes for .NET Core projects is explained here:
 [Default compilation includes in .NET Core projects][1]
 
 This document explains how default compilation includes is implemented for
-iOS, tvOS, watchOS and macOS projects.
+iOS, tvOS, macOS, and Mac Catalyst projects.
 
 Default inclusion can be completely disabled by setting
 `EnableDefaultItems=false`. It can also be disabled per-platform by setting
 the platform-specific variables `EnableDefaultiOSItems=false`,
-`EnableDefaulttvOSItems=false`, `EnableDefaultwatchOSItems=false`, or
+`EnableDefaulttvOSItems=false`, `EnableDefaultMacCatalystItems=false`, or
 `EnableDefaultmacOSItems=false`.
 
 ## Property lists

diff --git a/dotnet/Microsoft.watchOS.Sdk/Sdk/AutoImport.props b/dotnet/Microsoft.watchOS.Sdk/Sdk/AutoImport.props
diff --git a/dotnet/Microsoft.watchOS.Sdk/Sdk/Sdk.props b/dotnet/Microsoft.watchOS.Sdk/Sdk/Sdk.props
diff --git a/dotnet/Microsoft.watchOS.Sdk/targets/Microsoft.watchOS.Sdk.props b/dotnet/Microsoft.watchOS.Sdk/targets/Microsoft.watchOS.Sdk.props
diff --git a/dotnet/Microsoft.watchOS.Sdk/targets/Microsoft.watchOS.Sdk.targets b/dotnet/Microsoft.watchOS.Sdk/targets/Microsoft.watchOS.Sdk.targets
diff --git a/dotnet/package/Microsoft.watchOS.Ref/package.csproj b/dotnet/package/Microsoft.watchOS.Ref/package.csproj
diff --git a/dotnet/package/Microsoft.watchOS.Runtime.watchos-arm/package.csproj b/dotnet/package/Microsoft.watchOS.Runtime.watchos-arm/package.csproj
diff --git a/dotnet/package/Microsoft.watchOS.Runtime.watchos-x64/package.csproj b/dotnet/package/Microsoft.watchOS.Runtime.watchos-x64/package.csproj
diff --git a/dotnet/package/Microsoft.watchOS.Runtime.watchos-x86/package.csproj b/dotnet/package/Microsoft.watchOS.Runtime.watchos-x86/package.csproj
diff --git a/dotnet/package/Microsoft.watchOS.Sdk/package.csproj b/dotnet/package/Microsoft.watchOS.Sdk/package.csproj
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets b/dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
@@ -11,13 +11,17 @@
     <EnableDefaultmacOSItems Condition=" '$(_PlatformName)' == 'macOS' And '$(EnableDefaultmacOSItems)' == '' ">$(EnableDefaultItems)</EnableDefaultmacOSItems>
     <EnableDefaultMacCatalystItems Condition=" '$(_PlatformName)' == 'MacCatalyst' And '$(EnableDefaultMacCatalystItems)' == '' ">$(EnableDefaultItems)</EnableDefaultMacCatalystItems>
 
-    <!-- Don't include default Compile items for binding projects, because that would pick up ApiDefinition.cs and StructsAndEnums.cs -->
-    <EnableDefaultCompileItems Condition=" '$(IsBindingProject)' == 'true' ">false</EnableDefaultCompileItems>
-
     <UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_PlatformName)' != 'macOS'">true</UseMonoRuntime>
     <UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_PlatformName)' == 'macOS'">false</UseMonoRuntime>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- Exclude api definitions from files included by default -->
+    <Compile Remove="@(ObjcBindingApiDefinition)" />
+    <!-- Exclude core sources as well, we re-add them later (this way we make sure they only show up once in the Compile item group) -->
+    <Compile Remove="@(ObjcBindingCoreSource)" />
+  </ItemGroup>
+
   <!-- Architecture -->
   <!-- If the old-style variables are set, use those -->
   <PropertyGroup Condition=" '$(TargetArchitectures)' == '' ">

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -52,6 +52,11 @@
 		<UseAppHost>false</UseAppHost>
 	</PropertyGroup>
 
+	<!-- App extensions are self-contained, even though their OutputType=Library. This must be done here and not targets as it is checked before targets are invoked. -->
+	<PropertyGroup Condition="'$(IsAppExtension)' == 'true'">
+		<SelfContained>true</SelfContained>
+	</PropertyGroup>
+
 	<!--
 		Enable LLVM by default for mobile release builds.
 

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -96,9 +96,6 @@
 	</ItemGroup>
 
 	<PropertyGroup>
-		<!-- App extensions are self-contained, even though their OutputType=Library -->
-		<SelfContained Condition="'$(SelfContained)' == '' And $(_ProjectType.EndsWith('AppExtensionProject'))">true</SelfContained>
-
 		<!-- Add a property that specifies the name of the platform assembly for each platform -->
 		<_PlatformAssemblyName Condition=" '$(_PlatformName)' == 'iOS' ">Xamarin.iOS</_PlatformAssemblyName>
 		<_PlatformAssemblyName Condition=" '$(_PlatformName)' == 'tvOS' ">Xamarin.TVOS</_PlatformAssemblyName>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.2.21465.13">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rtm.21472.4">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>0d1cdfa6a08d7608d701ad69252349cfd800bb52</Sha>
+      <Sha>06123d8e7494c1944ca9707fbd1bd17dad99ff26</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21459.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.2.21465.13</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rtm.21472.4</MicrosoftDotnetSdkInternalPackageVersion>
     <MicrosoftNETILLinkTasksPackageVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
   </PropertyGroup>

diff --git a/external/Xamarin.MacDev b/external/Xamarin.MacDev
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
@@ -7,7 +7,7 @@ MONO_BRANCH    := $(shell cd $(MONO_PATH) 2> /dev/null && git symbolic-ref --sho
 endif
 
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := efad4f0baec567c7937ce0a87b2fc94ee0094a2b
+NEEDED_MACCORE_VERSION := 6f0bf5e2f40be0afe10b23995604808a5bc48959
 NEEDED_MACCORE_BRANCH := main
 
 MACCORE_DIRECTORY := maccore

diff --git a/msbuild/Xamarin.Localization.MSBuild/MSBStrings.Designer.cs b/msbuild/Xamarin.Localization.MSBuild/MSBStrings.Designer.cs
diff --git a/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx b/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
@@ -881,11 +881,11 @@
     </data>
 
     <data name="E0187" xml:space="preserve">
-        <value>Could not map the macOS version {0} to a corresponding iOS version</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
 
     <data name="E0188" xml:space="preserve">
-        <value>Could not map the iOS version {0} to a corresponding macOS version</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
 
     <data name="E7001" xml:space="preserve">

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx
@@ -1061,4 +1061,14 @@
             {2}: the value from the project file.
         </comment>
     </data>
+  <data name="E7083" xml:space="preserve">
+        <value>All font files must be located in the same directory in the app bundle. The following font files have different target directories in the app bundle:</value>
+        <comment>This error message will be followed by E7084 error messages listing the target directory for each font file</comment>
+    </data>
+  <data name="E7084" xml:space="preserve">
+        <value>The target directory is {0}</value>
+        <comment>See E7082 as well.
+            {0}: the target directory (in the app bundle) for the font file
+        </comment>
+    </data>
 </root>
diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx
@@ -1061,4 +1061,14 @@
             {2}: the value from the project file.
         </comment>
     </data>
+  <data name="E7083" xml:space="preserve">
+        <value>All font files must be located in the same directory in the app bundle. The following font files have different target directories in the app bundle:</value>
+        <comment>This error message will be followed by E7084 error messages listing the target directory for each font file</comment>
+    </data>
+  <data name="E7084" xml:space="preserve">
+        <value>The target directory is {0}</value>
+        <comment>See E7082 as well.
+            {0}: the target directory (in the app bundle) for the font file
+        </comment>
+    </data>
 </root>