Merge remote-tracking branch 'upstream/net8.0' into feature-switch-di…

…sable-dynamic-code

.github/policies/resourceManagement.yml

@@ -0,0 +1,148 @@
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: 
+      frequencies:
+      - weekday:
+          day: Monday
+          time: 0:0
+      - weekday:
+          day: Tuesday
+          time: 0:0
+      - weekday:
+          day: Wednesday
+          time: 0:0
+      - weekday:
+          day: Thursday
+          time: 0:0
+      - weekday:
+          day: Friday
+          time: 0:0
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: need-info
+      - noActivitySince:
+          days: 7
+      actions:
+      - addReply:
+          reply: Hi @${issueAuthor}. Due to inactivity, we will be closing this issue. Please feel free to re-open this issue if the issue persists. For enhanced visibility, if over 7 days have passed, please open a new issue and link this issue there. Thank you.
+      - closeIssue
+    - description: 
+      frequencies:
+      - weekday:
+          day: Monday
+          time: 0:0
+      - weekday:
+          day: Tuesday
+          time: 0:0
+      - weekday:
+          day: Wednesday
+          time: 0:0
+      - weekday:
+          day: Thursday
+          time: 0:0
+      - weekday:
+          day: Friday
+          time: 0:0
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: need-repro
+      - noActivitySince:
+          days: 7
+      actions:
+      - addReply:
+          reply: Hi @${issueAuthor}. Due to inactivity, we will be closing this issue. Please feel free to re-open this issue if the issue persists. For enhanced visibility, if over 7 days have passed, please open a new issue and link this issue there. Thank you.
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isOpen
+      - hasLabel:
+          label: move-to-vs-feedback
+      - noActivitySince:
+          days: 3
+      actions:
+      - addReply:
+          reply: This issue is being closed due to inactivity. If this issue is still affecting you, please follow the steps above to use the VS Feedback Tool to report the issue.
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: need-info
+      then:
+      - addReply:
+          reply: Hi @${issueAuthor}. We have added the "need-info" label to this issue, which indicates that we have an open question for you before we can take further action. This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
+      description: 
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: need-repro
+      then:
+      - addReply:
+          reply: >-
+            Hi @${issueAuthor}. We have added the "need-repro" label to this issue, which indicates that we require steps and sample code to reproduce the issue before we can take further action. Please try to create a minimal sample project/solution or code samples which reproduce the issue, ideally as a GitHub repo that we can clone. See more details about creating repros here: https://github.com/xamarin/xamarin-macios/blob/main/docs/bug-repro.md
+
+
+            This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - isAction:
+          action: Created
+      - isOpen
+      - or:
+        - hasLabel:
+            label: need-info
+        - hasLabel:
+            label: need-repro
+      - not:
+          activitySenderHasPermission:
+            permission: Admin
+      - not:
+          activitySenderHasPermission:
+            permission: Write
+      then:
+      - removeLabel:
+          label: need-info
+      - removeLabel:
+          label: need-repro
+      - addLabel:
+          label: need-attention
+      description: 
+    - if:
+      - payloadType: Issues
+      - isOpen
+      - labelAdded:
+          label: move-to-vs-feedback
+      then:
+      - addReply:
+          reply: >-
+            Thanks for the issue report @${issueAuthor}! This issue appears to be a problem with Visual Studio, so we ask that you use the VS feedback tool to report the issue. That way it will get to the routed to the team that owns this experience in VS.
+
+
+            If you encounter a problem with Visual Studio, we want to know about it so that we can diagnose and fix it. By using the Report a Problem tool, you can collect detailed information about the problem, and send it to Microsoft with just a few button clicks.
+
+
+            1. Go to the [Visual Studio for Windows feedback tool](https://docs.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022) or [Visual Studio for Mac feedback tool](https://learn.microsoft.com/en-us/visualstudio/mac/report-a-problem?view=vsmac-2022) to report the issue
+
+            2. Close this bug, and consider adding a link to the VS Feedback issue so that others can follow its activity there.
+
+
+            This issue will be automatically closed in 3 days if there are no further comments.
+      description: 
+onFailure: 
+onSuccess: 

dotnet/Makefile

@@ -191,12 +191,6 @@ $(DOTNET_NUPKG_DIR)/vs-workload.props: Makefile generate-vs-workload.csharp
 		--output $@.tmp
 	$(Q) mv $@.tmp $@
 
-$(DOTNET_NUPKG_DIR)/SignList.xml: Workloads/SignList.xml
-	$(Q) $(CP) $< $@
-
-$(DOTNET_NUPKG_DIR)/SignList.targets: Workloads/SignList.targets
-	$(Q) $(CP) $< $@
-
 TEMPLATED_FILES = \
 	$(foreach platform,$(DOTNET_PLATFORMS),Microsoft.$(platform).Sdk/targets/Microsoft.$(platform).Sdk.Versions.props) \
 	$(foreach platform,$(DOTNET_PLATFORMS),Microsoft.$(platform).Sdk/targets/Microsoft.$(platform).Sdk.SupportedTargetPlatforms.props) \
@@ -259,7 +253,7 @@ pack-$(shell echo $(1) | tr A-Z a-z): $$(RUNTIME_PACKS_$(1)) $$(REF_PACKS_$(1))
 endef
 $(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),$(eval $(call PacksDefinitions,$(platform))))
 
-TARGETS += $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLOAD_PACKS) $(DOTNET_NUPKG_DIR)/vs-workload.props $(DOTNET_NUPKG_DIR)/SignList.xml $(DOTNET_NUPKG_DIR)/SignList.targets $(SDK_PACKS_WINDOWS)
+TARGETS += $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLOAD_PACKS) $(DOTNET_NUPKG_DIR)/vs-workload.props $(SDK_PACKS_WINDOWS)
 
 define InstallWorkload
 # .NET comes with a workload for us, but we don't want that, we want our own. So delete the workload that comes with .NET.

dotnet/Workloads/SignVerifyIgnore.txt

@@ -0,0 +1,2 @@
+**\*.xml,ignore unsigned .xml
+**\cab*.cab.cab,ignore unsigned .cab

dotnet/targets/Xamarin.Shared.Sdk.props

@@ -140,8 +140,5 @@
 
 		<!-- This turns off some NativeAOT logic we don't want nor need -->
 		<NativeCompilationDuringPublish>false</NativeCompilationDuringPublish>
-
-		<!-- This works around an issue in NativeAOT: https://github.com/dotnet/runtime/issues/86186 -->
-		<IlcKeepManagedDebuggerSupport>true</IlcKeepManagedDebuggerSupport>
 	</PropertyGroup>
 </Project>

eng/Version.Details.xml

@@ -1,22 +1,22 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.1.23375.11">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.1.23378.5">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>f07981240e03480e993b95a823add01aec40511a</Sha>
+      <Sha>eee48b8da517110dcdcd100c1a36bb084abd4482</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23375.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23376.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3dd73e6d53aa7984e9e039b6eb9e7cbc5fec7431</Sha>
+      <Sha>ea97babd7ccfd2f6e9553093d315f26b51e4c7ac</Sha>
     </Dependency>
     <!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23375.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23376.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3dd73e6d53aa7984e9e039b6eb9e7cbc5fec7431</Sha>
+      <Sha>ea97babd7ccfd2f6e9553093d315f26b51e4c7ac</Sha>
     </Dependency>
     <!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rc.1.23375.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rc.1.23376.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>f2d2ba09c692c6cb1ed1fa0d2e9a047fa4bd4a9d</Sha>
+      <Sha>40dc1466a4543921e5e124ae6f92a813cae40e83</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23368.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>

eng/Versions.props

@@ -2,10 +2,10 @@
   <!--Package versions-->
   <PropertyGroup>
     <!-- Versions updated by maestro -->
-    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23375.11</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23375.3</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23378.5</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23376.5</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23375.3</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23376.5</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23368.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
     <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>7.0.7</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-rc.1.23375.11"
+    "version": "8.0.100-rc.1.23378.5"
   }
 }

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx

@@ -1206,7 +1206,7 @@
         <value>Úloze “{0}“ nebyla určena hodnota parametru „{1}“, která se při sestavování na této platformě vyžaduje.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>Sestavení illink neexistuje: „{0}“</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx

@@ -1206,7 +1206,7 @@
         <value>Der "{0}"-Aufgabe wurde kein Wert für den Parameter "{1}" übergeben, der beim Erstellen auf dieser Plattform erforderlich ist.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>Die illink-Assembly ist nicht vorhanden: „{0}“.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.es.resx

@@ -1206,7 +1206,7 @@
         <value>A la tarea "{0}" no se le asignó un valor para el parámetro "{1}", que es necesario para compilar en esta plataforma.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>El ensamblado illink no existe: '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.fr.resx

@@ -1206,7 +1206,7 @@
         <value>La tâche « {0} » n’a pas reçu de valeur pour le paramètre « {1} », ce qui est requis lors de la génération sur cette plateforme.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>L’assembly illink n’existe pas : '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.it.resx

@@ -1206,7 +1206,7 @@
         <value>All'attività "{0}" non è stato assegnato un valore per il parametro "{1}", necessario per la compilazione in questa piattaforma.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>L'assembly illink non esiste: '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ja.resx

@@ -1206,7 +1206,7 @@
         <value>"{0}" タスクにパラメーター "{1}" の値が指定されませんでした。これは、このプラットフォームでビルドするときに必要です。</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>illink アセンブリが存在しません: '{0}'。</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ko.resx

@@ -1206,7 +1206,7 @@
         <value>"{0}" 작업에 이 플랫폼에서 빌드할 때 필요한 매개 변수 "{1}" 값이 제공되지 않았습니다.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>잘못된 어셈블리가 없습니다. '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pl.resx

@@ -1206,7 +1206,7 @@
         <value>Zadanie „{0}” nie otrzymało wartości parametru „{1}”, która jest wymagana podczas kompilowania na tej platformie.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>Zestaw plików illink nie istnieje „{0}”.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pt-BR.resx

@@ -1206,7 +1206,7 @@
         <value>A tarefa "{0}" não recebeu um valor para o parâmetro "{1}", que é necessário ao compilar nesta plataforma.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>O assembly illink não existe: '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ru.resx

@@ -1206,7 +1206,7 @@
         <value>Задаче "{0}" не было присвоено значение параметра "{1}", которое требуется при сборке на этой платформе.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>Сборка illink не существует: '"{0}".</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.tr.resx

@@ -1206,7 +1206,7 @@
         <value>"{0}" görevine bu platformda derleme sırasında gerekli olan "{1}" parametresi için bir değer verilmedi.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>illink derlemesi yok: '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hans.resx

@@ -1206,7 +1206,7 @@
         <value>"{0}"任务未给参数 "{1}" 提供值，在此平台上生成时需要该值。</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>illink 程序集不存在:“{0}”。</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hant.resx

@@ -1206,7 +1206,7 @@
         <value>"{0}" 工作未指定參數 "{1}" 的值，這是在此平台上建置時的必要值。</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>illink 組件不存在: '{0}'。</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

tests/xharness/Harness.cs

@@ -163,7 +163,12 @@ string MlaunchPath {
 						return $"Not building any mobile platform, so can't provide a location to mlaunch.";
 					}
 					var mlaunchPath = Path.Combine (DOTNET_DIR, "packs");
-					mlaunchPath = Path.Combine (mlaunchPath, $"Microsoft.{platform}.Sdk", config [$"{platform.ToUpperInvariant ()}_NUGET_VERSION_NO_METADATA"]);
+					// there is a diff between getting the path for the current platform when running on CI or off CI. The config files in the CI do not 
+					// contain the correct workload version, the reason for this is that the workload is built in a different machine which means that
+					// the Make.config will use the wrong version. The CI set the version in the environment variable {platform}_WORKLOAD_VERSION via a script.
+					var workloadVersion = Environment.GetEnvironmentVariable ($"{platform.ToUpperInvariant ()}_WORKLOAD_VERSION");
+					mlaunchPath = Path.Combine (mlaunchPath, $"Microsoft.{platform}.Sdk",
+							string.IsNullOrEmpty (workloadVersion) ? config [$"{platform.ToUpperInvariant ()}_NUGET_VERSION_NO_METADATA"] : workloadVersion);
 					mlaunchPath = Path.Combine (mlaunchPath, "tools", "bin", "mlaunch");
 					return mlaunchPath;
 				} else if (INCLUDE_XAMARIN_LEGACY && INCLUDE_IOS) {

tools/devops/automation/scripts/bash/build-nugets.sh

@@ -14,8 +14,9 @@ mkdir -p ../package/
 rm -f ../package/*.nupkg
 cp -c "$DOTNET_NUPKG_DIR"/*.nupkg ../package/
 cp -c "$DOTNET_NUPKG_DIR"/vs-workload.props ../package/
-cp -c "$DOTNET_NUPKG_DIR"/SignList.xml ../package/
-cp -c "$DOTNET_NUPKG_DIR"/SignList.targets ../package/
+cp -c dotnet/Workloads/SignList.xml ../package/
+cp -c dotnet/Workloads/SignList.targets ../package/
+cp -c dotnet/Workloads/SignVerifyIgnore.txt ../package/
 
 DOTNET_PKG_DIR=$(make -C tools/devops print-abspath-variable VARIABLE=DOTNET_PKG_DIR | grep "^DOTNET_PKG_DIR=" | sed -e 's/^DOTNET_PKG_DIR=//')
 make -C dotnet package -j