[Recursive sync] installer / 9d6e3d7 → 57efcf1

Updated repositories: - installer / 9d6e3d7 → 57efcf1 https://github.com/dotnet/installer/compare/9d6e3d71808815da6f49c7681c35858214d59103..57efcf1350ab087efe97ced8199ab0b494636adf - aspire / 276cc28 → 4b00c57 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire/compare/276cc28b03c11e2850546e604c707e664339fc15..4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324 [[ commit created by automation ]]
dotnet · Nov 1, 2023 · 40e7f01 · 40e7f01
2 parents 1d7e453 + 6640abf
commit 40e7f01
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -162,7 +162,7 @@ To enable full offline source-building of the VMR, we have no other choice than
 - `src/arcade`  
 *[dotnet/arcade@39042b4](https://github.com/dotnet/arcade/commit/39042b4048580366d35a7c1c4f4ce8fc0dbea4b4)*
 - `src/aspire`  
-*[_git/dotnet-aspire@276cc28](https://dev.azure.com/dnceng/internal/_git/dotnet-aspire/commit/276cc28b03c11e2850546e604c707e664339fc15)*
+*[_git/dotnet-aspire@4b00c57](https://dev.azure.com/dnceng/internal/_git/dotnet-aspire/commit/4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324)*
 - `src/aspnetcore`  
 *[_git/dotnet-aspnetcore@3f1acb5](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/commit/3f1acb59718cadf111a0a796681e3d3509bb3381)*
     - `src/aspnetcore/src/submodules/googletest`  
@@ -184,7 +184,7 @@ To enable full offline source-building of the VMR, we have no other choice than
 - `src/fsharp`  
 *[dotnet/fsharp@f41fe15](https://github.com/dotnet/fsharp/commit/f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20)*
 - `src/installer`  
-*[dotnet/installer@9d6e3d7](https://github.com/dotnet/installer/commit/9d6e3d71808815da6f49c7681c35858214d59103)*
+*[dotnet/installer@57efcf1](https://github.com/dotnet/installer/commit/57efcf1350ab087efe97ced8199ab0b494636adf)*
 - `src/msbuild`  
 *[dotnet/msbuild@195e7f5](https://github.com/dotnet/msbuild/commit/195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22)*
 - `src/nuget-client`  

diff --git a/prereqs/git-info/AllRepoVersions.props b/prereqs/git-info/AllRepoVersions.props
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <arcadeGitCommitHash>39042b4048580366d35a7c1c4f4ce8fc0dbea4b4</arcadeGitCommitHash>
     <arcadeOutputPackageVersion>8.0.0-beta.23516.4</arcadeOutputPackageVersion>
-    <aspireGitCommitHash>276cc28b03c11e2850546e604c707e664339fc15</aspireGitCommitHash>
-    <aspireOutputPackageVersion>8.0.0-preview.1.23531.6</aspireOutputPackageVersion>
+    <aspireGitCommitHash>4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324</aspireGitCommitHash>
+    <aspireOutputPackageVersion>8.0.0-preview.1.23551.7</aspireOutputPackageVersion>
     <aspnetcoreGitCommitHash>3f1acb59718cadf111a0a796681e3d3509bb3381</aspnetcoreGitCommitHash>
     <aspnetcoreOutputPackageVersion>8.0.0-rtm.23531.12</aspnetcoreOutputPackageVersion>
     <cecilGitCommitHash>45dd3a73dd5b64b010c4251303b3664bb30df029</cecilGitCommitHash>
@@ -21,7 +21,7 @@
     <formatOutputPackageVersion>8.0.453106</formatOutputPackageVersion>
     <fsharpGitCommitHash>f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20</fsharpGitCommitHash>
     <fsharpOutputPackageVersion>8.0.100-beta.23523.6</fsharpOutputPackageVersion>
-    <installerGitCommitHash>9d6e3d71808815da6f49c7681c35858214d59103</installerGitCommitHash>
+    <installerGitCommitHash>57efcf1350ab087efe97ced8199ab0b494636adf</installerGitCommitHash>
     <installerOutputPackageVersion>8.0.100</installerOutputPackageVersion>
     <msbuildGitCommitHash>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</msbuildGitCommitHash>
     <msbuildOutputPackageVersion>17.8.3-preview-23519-04</msbuildOutputPackageVersion>

diff --git a/prereqs/git-info/aspire.props b/prereqs/git-info/aspire.props
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <GitCommitHash>276cc28b03c11e2850546e604c707e664339fc15</GitCommitHash>
-    <OfficialBuildId>20231031.6</OfficialBuildId>
-    <OutputPackageVersion>8.0.0-preview.1.23531.6</OutputPackageVersion>
+    <GitCommitHash>4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324</GitCommitHash>
+    <OfficialBuildId>20231101.7</OfficialBuildId>
+    <OutputPackageVersion>8.0.0-preview.1.23551.7</OutputPackageVersion>
     <PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
     <IsStable>false</IsStable>
   </PropertyGroup>

diff --git a/prereqs/git-info/installer.props b/prereqs/git-info/installer.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <GitCommitHash>9d6e3d71808815da6f49c7681c35858214d59103</GitCommitHash>
+    <GitCommitHash>57efcf1350ab087efe97ced8199ab0b494636adf</GitCommitHash>
     <OfficialBuildId>20231101.1</OfficialBuildId>
     <OutputPackageVersion>8.0.100</OutputPackageVersion>
     <PreReleaseVersionLabel></PreReleaseVersionLabel>

diff --git a/src/aspire/Directory.Build.props b/src/aspire/Directory.Build.props
@@ -24,6 +24,11 @@
     <SkipAspireWorkloadManifest>true</SkipAspireWorkloadManifest>
   </PropertyGroup>
 
+  <!-- Internal branches don't use package source mapping feature due to internal feeds, so disable NU1507 warning saying it should be used. -->
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
+  </PropertyGroup>
+
   <!-- OS/Architecture properties for local development resources -->
   <PropertyGroup>
     <BuildOs Condition="$([MSBuild]::IsOsPlatform('Linux'))">linux</BuildOs>

diff --git a/src/aspire/Directory.Packages.props b/src/aspire/Directory.Packages.props
@@ -93,11 +93,11 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.2" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.5.1-beta.1" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.10" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.11" />
     <!-- build dependencies -->
     <PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" />
     <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23371.1" />
     <PackageVersion Include="Microsoft.Signed.Wix" Version="1.0.0-v3.14.0.5722" />
     <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23371.1" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/aspire/NuGet.config b/src/aspire/NuGet.config
@@ -2,47 +2,35 @@
 <configuration>
   <packageSources>
     <clear />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-extensions -->
+    <add key="darc-int-dotnet-extensions-0db4832" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-extensions-0db4832a/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-extensions -->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-3f1acb5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3f1acb59/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-5535e31" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5535e31a/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <!-- Required as https://github.com/dotnet/runtime/pull/89509 did not get backported to .NET 8 Preview 7 -->
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-libraries-internal/nuget/v3/index.json" />
   </packageSources>
-  <packageSourceMapping>
-    <packageSource key="dotnet-public">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet8">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet-libraries">
-      <package pattern="Yarp.ReverseProxy" />
-    </packageSource>
-    <packageSource key="dotnet-libraries-internal">
-      <package pattern="Microsoft.DeveloperControlPlane*" />
-    </packageSource>
-    <packageSource key="dotnet-eng">
-      <package pattern="MicroBuild.Core.Sentinel" />
-      <package pattern="Microsoft.DiaSymReader.Pdb2Pdb" />
-      <package pattern="Microsoft.DotNet.Arcade.Sdk" />
-      <package pattern="Microsoft.DotNet.Build.*" />
-      <package pattern="Microsoft.DotNet.Darc" />
-      <package pattern="Microsoft.DotNet.Helix.Sdk" />
-      <package pattern="Microsoft.DotNet.Maestro.Tasks" />
-      <package pattern="Microsoft.DotNet.RemoteExecutor" />
-      <package pattern="Microsoft.DotNet.SignTool" />
-      <package pattern="Microsoft.DotNet.SourceBuild.Tasks" />
-      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
-      <package pattern="Microsoft.DotNet.SignCheck" />
-      <package pattern="Microsoft.DotNet.Tar" />
-      <package pattern="Microsoft.DotNet.XliffTasks" />
-      <package pattern="Microsoft.DotNet.XUnitExtensions" />
-      <package pattern="Microsoft.Signed.Wix" />
-      <package pattern="Microsoft.SymbolUploader.Build.Task" />
-      <package pattern="sn" />
-      <package pattern="Microsoft.DotNet.SharedFramework.Sdk" />
-    </packageSource>
-  </packageSourceMapping>
-  <disabledPackageSources />
+  <disabledPackageSources>
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-extensions -->
+    <add key="darc-int-dotnet-extensions-0db4832" value="true" />
+    <!--  End: Package sources from dotnet-extensions -->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-3f1acb5" value="true" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-5535e31" value="true" />
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
+  </disabledPackageSources>
 </configuration>
diff --git a/src/aspire/eng/Version.Details.xml b/src/aspire/eng/Version.Details.xml
@@ -29,9 +29,9 @@
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
       <Sha>7a020a231e5b13608ab3749d30263269ff32984d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Resilience" Version="8.0.0-rtm.23524.3">
-      <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>6602e6a12c012db4246f261c179f74fd612cd0a6</Sha>
+    <Dependency Name="Microsoft.Extensions.Http.Resilience" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
+      <Sha>0db4832a73bcd20fe6eaaa01ff64d18e329d438d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23516.4">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

diff --git a/src/aspire/eng/Versions.props b/src/aspire/eng/Versions.props
@@ -24,6 +24,6 @@
     <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23525.4</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23525.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
     <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23525.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftExtensionsHttpResiliencePackageVersion>8.0.0-rtm.23524.3</MicrosoftExtensionsHttpResiliencePackageVersion>
+    <MicrosoftExtensionsHttpResiliencePackageVersion>8.0.0</MicrosoftExtensionsHttpResiliencePackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/aspire/eng/pipelines/azure-pipelines.yml b/src/aspire/eng/pipelines/azure-pipelines.yml
@@ -4,12 +4,14 @@ trigger:
     include:
     - main
     - release/*
+    - internal/release/*
 
 pr:
   branches:
     include:
     - main
     - release/*
+    - internal/release/*
 
 variables:
 - template: /eng/pipelines/common-variables.yml
@@ -73,6 +75,14 @@ stages:
           fetchDepth: 0
           clean: true
         steps:
+        - task: PowerShell@2
+          displayName: Setup Private Feeds Credentials
+          condition: eq(variables['Agent.OS'], 'Windows_NT')
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+            arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+          env:
+            Token: $(dn-bot-dnceng-artifact-feeds-rw)
         - script: eng\common\cibuild.cmd
             -configuration $(_BuildConfig)
             -prepareMachine
@@ -112,6 +122,14 @@ stages:
           - checkout: self
             clean: true
           steps:
+          - task: Bash@3
+            displayName: Setup Private Feeds Credentials
+            inputs:
+              filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+              arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+            condition: ne(variables['Agent.OS'], 'Windows_NT')
+            env:
+              Token: $(dn-bot-dnceng-artifact-feeds-rw)
           - script: eng/common/cibuild.sh
               --configuration $(_BuildConfig)
               --prepareMachine

diff --git a/src/aspire/eng/pipelines/common-variables.yml b/src/aspire/eng/pipelines/common-variables.yml
@@ -20,7 +20,6 @@ variables:
     # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
     # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
     # DotNet-HelixApi-Access provides: HelixApiAccessToken
-    - group: DotNet-Blob-Feed
     - group: Publish-Build-Assets
     - group: DotNet-HelixApi-Access
     - group: SDL_Settings

diff --git a/src/aspire/src/Aspire.Hosting/Dcp/DcpHostService.cs b/src/aspire/src/Aspire.Hosting/Dcp/DcpHostService.cs
@@ -190,7 +190,9 @@ private ProcessSpec CreateDcpProcessSpec(Locations locations)
         return dcpProcessSpec;
     }
 
-    private const int WaitTimeForDockerTestCommandInSeconds = 10;
+    // Docker goes to into resource saver mode after 5 minutes of not running a container (by default).
+    // While in this mode, the commands we use for the docker check take quite some time
+    private const int WaitTimeForDockerTestCommandInSeconds = 25;
 
     private void EnsureDockerIfNecessary()
     {

diff --git a/src/installer/eng/Version.Details.xml b/src/installer/eng/Version.Details.xml
@@ -172,9 +172,9 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>2406616d0e3a31d80b326e27c156955bfa41c791</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23531.6">
+    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23551.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
-      <Sha>276cc28b03c11e2850546e604c707e664339fc15</Sha>
+      <Sha>4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324</Sha>
       <SourceBuild RepoName="aspire" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.0-rtm.23530.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">

diff --git a/src/installer/eng/Versions.props b/src/installer/eng/Versions.props
@@ -238,7 +238,7 @@
   <!-- Workload manifest package versions -->
   <PropertyGroup>
     <AspireFeatureBand>8.0.100</AspireFeatureBand>
-    <AspireWorkloadManifestVersion>8.0.0-preview.1.23531.6</AspireWorkloadManifestVersion>
+    <AspireWorkloadManifestVersion>8.0.0-preview.1.23551.7</AspireWorkloadManifestVersion>
     <MauiFeatureBand>8.0.100-rc.2</MauiFeatureBand>
     <MauiWorkloadManifestVersion>8.0.0-rc.2.9373</MauiWorkloadManifestVersion>
     <XamarinAndroidWorkloadManifestVersion>34.0.0-rc.2.468</XamarinAndroidWorkloadManifestVersion>

diff --git a/src/source-manifest.json b/src/source-manifest.json
@@ -7,10 +7,10 @@
       "commitSha": "39042b4048580366d35a7c1c4f4ce8fc0dbea4b4"
     },
     {
-      "packageVersion": "8.0.0-preview.1.23531.6",
+      "packageVersion": "8.0.0-preview.1.23551.7",
       "path": "aspire",
       "remoteUri": "https://dev.azure.com/dnceng/internal/_git/dotnet-aspire",
-      "commitSha": "276cc28b03c11e2850546e604c707e664339fc15"
+      "commitSha": "4b00c57d7ccf9a4c7e2aef211ab6bd8af3ee2324"
     },
     {
       "packageVersion": "8.0.0-rtm.23531.12",
@@ -64,7 +64,7 @@
       "packageVersion": "8.0.100",
       "path": "installer",
       "remoteUri": "https://github.com/dotnet/installer",
-      "commitSha": "9d6e3d71808815da6f49c7681c35858214d59103"
+      "commitSha": "57efcf1350ab087efe97ced8199ab0b494636adf"
     },
     {
       "packageVersion": "17.8.3-preview-23519-04",