[net11.0] Update dependencies from dotnet/dotnet

NuGet.config

@@ -10,8 +10,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-macios -->
-    <add key="darc-pub-dotnet-macios-4681bf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-macios-4681bf9-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92-1/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-macios-4177c9d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4177c9d9/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-macios -->
     <!--  Begin: Package sources from xamarin-xamarin-macios -->
@@ -26,34 +24,13 @@
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
     <add key="Dotnet arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
-    <!-- dotnet8-transport is required for Microsoft.DotNet.Cecil -->
-    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
-    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
+    <add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
     <add key="macios-dependencies" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/macios-dependencies/nuget/v3/index.json" />
     <add key="xamarin-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
     <add key="local-tests-feed" value="tests/.nuget/packages" />
-    <!-- Add a 8.0.12 feed -->
-    <add key="darc-pub-dotnet-emsdk-0218136" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0218136c/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-runtime-c1ae962" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c1ae9626/nuget/v3/index.json" />
-    <!-- Add a 8.0.13 feed -->
-    <add key="darc-pub-dotnet-runtime-e346656" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-e346656d/nuget/v3/index.json" />
-    <!-- Add a 8.0.14 feed -->
-    <add key="darc-pub-dotnet-runtime-0fdf85d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0fdf85d5/nuget/v3/index.json" />
-    <!-- Add a 8.0.15 feed -->
-    <add key="darc-pub-dotnet-runtime-7aa8bb0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-7aa8bb0e/nuget/v3/index.json" />
-    <!-- Add a 8.0.16 feed -->
-    <add key="darc-pub-dotnet-runtime-0239fb04" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0239fb04/nuget/v3/index.json" />
-    <!-- Add a 8.0.18 feed -->
-    <add key="darc-pub-dotnet-runtime-c0390586" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c0390586/nuget/v3/index.json" />
-    <!-- Add a 8.0.22 feed -->
-    <add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
-    <!-- Add a 9.0.5 feed -->
-    <add key="darc-pub-dotnet-runtime-38d99eb2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-38d99eb2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-bfcae359" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-bfcae359/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

eng/Version.Details.props

@@ -6,13 +6,16 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet/dotnet dependencies -->
-    <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25512.102</MicrosoftDotNetCecilPackageVersion>
-    <MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25512.102</MicrosoftNETILLinkPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-rtm.25512.102</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-rtm.25512.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
-    <MicrosoftNETSdkPackageVersion>10.0.100-rtm.25512.102</MicrosoftNETSdkPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-rtm.25512.102</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-rtm.25512.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25520.104</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25520.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25520.104</MicrosoftDotNetCecilPackageVersion>
+    <MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25520.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
+    <MicrosoftNETILLinkPackageVersion>10.0.0-rc.1.25520.104</MicrosoftNETILLinkPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-rc.1.25520.104</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-rc.1.25520.104</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25520.104</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25520.104</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25520.104</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
     <!-- dotnet/macios dependencies -->
     <MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
     <MicrosoftiOSSdknet90_260PackageVersion>26.0.9754</MicrosoftiOSSdknet90_260PackageVersion>
@@ -27,10 +30,6 @@ This file should be imported by eng/Versions.props
     <MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
     <MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
     <MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
-    <!-- dotnet/arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25513.2</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25513.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25513.2</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
     <!-- dotnet/xharness dependencies -->
     <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25513.3</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
   </PropertyGroup>

eng/Version.Details.xml

@@ -1,29 +1,29 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25512.102">
+    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.2.25520.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25512.102">
+    <Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rc.1.25520.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rtm.25512.102">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.1.25520.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rtm.25512.102">
+    <Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rc.1.25520.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
     <!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rtm.25512.102">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25520.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25512.102">
+    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25520.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
     <!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
     <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9227">
@@ -78,25 +78,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25513.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e8ca69398033dd1eea35e9667bf857234465de2b</Sha>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25520.104">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25513.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e8ca69398033dd1eea35e9667bf857234465de2b</Sha>
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25520.104">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-rtm.25512.102">
+    <Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25520.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>0b60d265d30d96c827b73dbce74cb78f600d3c92</Sha>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25513.3">
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>47d2875bd1eacb26e5c4b06a5fe3fc15186e2ae4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25513.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e8ca69398033dd1eea35e9667bf857234465de2b</Sha>
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25520.104">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

eng/common/SetupNugetSources.sh

@@ -66,8 +66,10 @@ EnableInternalPackageSource() {
     grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
     if [ "$?" == "0" ]; then
         echo "Enabling internal source '$PackageSourceName'."
-        # Remove the disabled entry (including any surrounding comments or whitespace on the same line)
-        sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
+        # Remove the disabled entry
+        local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
+        local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
+        sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
 
         # Add the source name to PackageSources for credential handling
         PackageSources+=("$PackageSourceName")

eng/common/build.sh

@@ -92,7 +92,7 @@ runtime_source_feed=''
 runtime_source_feed_key=''
 
 properties=()
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
     -help|-h)

eng/common/core-templates/job/job.yml

@@ -19,6 +19,8 @@ parameters:
   # publishing defaults
   artifacts: ''
   enableMicrobuild: false
+  enablePreviewMicrobuild: false
+  microbuildPluginVersion: 'latest'
   enableMicrobuildForMacAndLinux: false
   microbuildUseESRP: true
   enablePublishBuildArtifacts: false
@@ -128,6 +130,8 @@ jobs:
     - template: /eng/common/core-templates/steps/install-microbuild.yml
       parameters:
         enableMicrobuild: ${{ parameters.enableMicrobuild }}
+        enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
+        microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
         enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
         microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
         continueOnError: ${{ parameters.continueOnError }}
@@ -153,6 +157,8 @@ jobs:
     - template: /eng/common/core-templates/steps/cleanup-microbuild.yml
       parameters:
         enableMicrobuild: ${{ parameters.enableMicrobuild }}
+        enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
+        microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
         enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
         continueOnError: ${{ parameters.continueOnError }}
 

eng/common/core-templates/steps/generate-sbom.yml

@@ -5,7 +5,7 @@
 # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
 
 parameters:
-  PackageVersion: 10.0.0
+  PackageVersion: 11.0.0
   BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
   PackageName: '.NET'
   ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom

eng/common/core-templates/steps/install-microbuild-impl.yml

@@ -0,0 +1,34 @@
+parameters:
+  - name: microbuildTaskInputs
+    type: object
+    default: {}
+
+  - name: microbuildEnv
+    type: object
+    default: {}
+
+  - name: enablePreviewMicrobuild
+    type: boolean
+    default: false
+
+  - name: condition
+    type: string
+
+  - name: continueOnError
+    type: boolean
+
+steps:
+- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
+    - task: MicroBuildSigningPluginPreview@4
+      displayName: Install Preview MicroBuild plugin (Windows)
+      inputs: ${{ parameters.microbuildTaskInputs }}
+      env: ${{ parameters.microbuildEnv }}
+      continueOnError: ${{ parameters.continueOnError }}
+      condition: ${{ parameters.condition }}
+- ${{ else }}:
+  - task: MicroBuildSigningPlugin@4
+    displayName: Install MicroBuild plugin (Windows)
+    inputs: ${{ parameters.microbuildTaskInputs }}
+    env: ${{ parameters.microbuildEnv }}
+    continueOnError: ${{ parameters.continueOnError }}
+    condition: ${{ parameters.condition }}