Merge branch 'internal/release/8.0-preview1' into joperezr/MergeChang…

…esFromInternal
dotnet · Nov 14, 2023 · 86de588 · 86de588
2 parents 7d040dc + 48e42f5
commit 86de588
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 44 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -23,6 +23,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/Directory.Packages.props b/Directory.Packages.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <RuntimeVersion>8.0.0-rtm.23511.16</RuntimeVersion>
-    <AspNetCoreVersion>8.0.0-rtm.23512.20</AspNetCoreVersion>
-    <EfCoreVersion>8.0.0-rtm.23512.13</EfCoreVersion>
+    <RuntimeVersion>$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)</RuntimeVersion>
+    <AspNetCoreVersion>$(MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion)</AspNetCoreVersion>
+    <EfCoreVersion>$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)</EfCoreVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- Azure SDK for .NET dependencies -->

diff --git a/NuGet.config b/NuGet.config
@@ -2,47 +2,41 @@
 <configuration>
   <packageSources>
     <clear />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-c838682" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c838682d/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-e017dc1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-e017dc12/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-efcore -->
+    <!--  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-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-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-c838682" value="true" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-e017dc1" value="true" />
+    <!--  End: Package sources from dotnet-efcore -->
+    <!--  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-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/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -29,15 +29,87 @@
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
       <Sha>5173daa9d8649d3b1af7025adc0d3431a2b7434b</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>
       <Sha>b4fa7f2e1e65ef49881be2ab2df27624280a8c55</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Http" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Options" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.AspNetCore.OpenApi" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>c838682d8984f0183abb48a4032bf7846fef52ae</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>c838682d8984f0183abb48a4032bf7846fef52ae</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>c838682d8984f0183abb48a4032bf7846fef52ae</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>c838682d8984f0183abb48a4032bf7846fef52ae</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>c838682d8984f0183abb48a4032bf7846fef52ae</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Features" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>c838682d8984f0183abb48a4032bf7846fef52ae</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
+      <Sha>e017dc125bef2f604f85befd8ff27544a5a67c38</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
+      <Sha>e017dc125bef2f604f85befd8ff27544a5a67c38</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
+      <Sha>e017dc125bef2f604f85befd8ff27544a5a67c38</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23525.4">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -24,6 +24,9 @@
     <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>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion>8.0.0</MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>8.0.0</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/pipelines/azure-pipelines.yml b/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/eng/pipelines/common-variables.yml b/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