[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'

.vsts-ci.yml

@@ -98,7 +98,7 @@ extends:
             name: $(DncEngInternalBuildPool)
             image: windows.vs2022.amd64
             os: windows
-          helixTargetQueue: windows.amd64.vs2022.pre
+          helixTargetQueue: windows.amd64.vs2026.pre.scout
           oneESCompat:
             templateFolderName: templates-official
             publishTaskPrefix: 1ES.

.vsts-pr.yml

@@ -42,7 +42,7 @@ stages:
         name: $(DncEngPublicBuildPool)
         demands: ImageOverride -equals windows.vs2022.amd64.open
         os: windows
-      helixTargetQueue: windows.amd64.vs2022.pre.open
+      helixTargetQueue: windows.amd64.vs2026.pre.scout.open
 
   ############### LINUX ###############
   - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml

NuGet.config

@@ -4,7 +4,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
-    <add key="darc-pub-dotnet-dotnet-03ebd38" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-03ebd38e/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-dotnet-79c85d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-79c85d96/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from microsoft-testfx -->
     <!--  End: Package sources from microsoft-testfx -->

eng/Versions.props

@@ -142,13 +142,13 @@
     <BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Workload manifest package versions">
-    <MauiFeatureBand>10.0.100-preview.6</MauiFeatureBand>
-    <MauiWorkloadManifestVersion>10.0.0-preview.6.25359.8</MauiWorkloadManifestVersion>
-    <XamarinAndroidWorkloadManifestVersion>36.0.0-preview.6.169</XamarinAndroidWorkloadManifestVersion>
-    <XamarinIOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinIOSWorkloadManifestVersion>
-    <XamarinMacCatalystWorkloadManifestVersion>18.5.10415-net10-p6</XamarinMacCatalystWorkloadManifestVersion>
-    <XamarinMacOSWorkloadManifestVersion>15.5.10415-net10-p6</XamarinMacOSWorkloadManifestVersion>
-    <XamarinTvOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinTvOSWorkloadManifestVersion>
+    <MauiFeatureBand>10.0.100-rc.2</MauiFeatureBand>
+    <MauiWorkloadManifestVersion>10.0.0-rc.2.25504.7</MauiWorkloadManifestVersion>
+    <XamarinAndroidWorkloadManifestVersion>36.0.0-rc.2.332</XamarinAndroidWorkloadManifestVersion>
+    <XamarinIOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinIOSWorkloadManifestVersion>
+    <XamarinMacCatalystWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacCatalystWorkloadManifestVersion>
+    <XamarinMacOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacOSWorkloadManifestVersion>
+    <XamarinTvOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinTvOSWorkloadManifestVersion>
   </PropertyGroup>
   <PropertyGroup Label="Pinned dependency">
     <!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

global.json

@@ -21,10 +21,10 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"
+    "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"
   }
 }

src/Layout/pkg/windows/Directory.Build.targets

@@ -44,13 +44,22 @@
            Text="Bundles must target x86. InstallerPlatform=$(InstallerPlatform)" />
   </Target>
 
+  <!-- This target can be used to set additional Wix options. -->
+  <Target Name="SetAdditionalWixOptions" BeforeTargets="CoreCompile">
+    <PropertyGroup>
+      <!-- Use backwards compatible GUID generation. -->
+      <CompilerAdditionalOptions>$(CompilerAdditionalOptions) -bcgg</CompilerAdditionalOptions>
+    </PropertyGroup>
+  </Target>
+
   <Target Name="GenerateWixpackPackage" AfterTargets="CoreCompile">
     <PropertyGroup>
       <WixpackWorkingDir>$(IntermediateOutputPath)wixpack</WixpackWorkingDir>
       <WixpackOutputDir>$(ArtifactsNonShippingPackagesDir)</WixpackOutputDir>
     </PropertyGroup>
 
     <CreateWixBuildWixpack
+      AdditionalOptions="$(CompilerAdditionalOptions) $(LinkerAdditionalOptions)"
       BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension)"
       Cultures="%(CultureGroup.Identity)"
       DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)"

src/Tasks/Common/Resources/Strings.resx

@@ -970,10 +970,6 @@ You may need to build the project on another operating system or architecture, o
     <value>NETSDK1222: PreferNativeArm64 applies only to .NET Framework targets. It is not supported and has no effect for when targeting .NET Core.</value>
     <comment>{StrBegins="NETSDK1222: "}</comment>
   </data>
-  <data name="Net9NotCompatibleWithDev1711" xml:space="preserve">
-    <value>NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported.</value>
-    <comment>{StrBegins="NETSDK1223: "}</comment>
-  </data>
   <data name="AspNetCorePackUnsupportedTargetFramework" xml:space="preserve">
     <value>NETSDK1224: ASP.NET Core framework assets are not supported for the target framework.</value>
     <comment>{StrBegins="NETSDK1224: "}</comment>
@@ -1010,5 +1006,9 @@ You may need to build the project on another operating system or architecture, o
     <value>NETSDK1232: Unable to find a matching RID for '{0}' from among [{1}] in graph '{2}'.</value>
     <comment>{StrBegins="NETSDK1232: "}{Locked="{0}"}{Locked="{1}"}{Locked="{2}"}</comment>
   </data>
-  <!-- The latest message added is UnableToFindMatchingRid. Please update this value with each PR to catch parallel PRs both adding a new message -->
+  <data name="Net10NotCompatibleWithVS17" xml:space="preserve">
+    <value>NETSDK1233: Targeting .NET 10.0 or higher in Visual Studio 2022 17.14 is not supported.</value>
+    <comment>{StrBegins="NETSDK1233: "}</comment>
+  </data>
+  <!-- The latest message added is Net10NotCompatibleWithVS17. Please update this value with each PR to catch parallel PRs both adding a new message -->
 </root>