Remove internal feeds

dotnet · Nov 14, 2023 · 7585d56 · 7585d56
1 parent 86de588
commit 7585d56
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 82 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -23,11 +23,6 @@
     <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/NuGet.config b/NuGet.config
@@ -2,41 +2,26 @@
 <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>
-  <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>
+  <packageSourceMapping>
+    <packageSource key="dotnet-public">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet8">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet-libraries">
+      <package pattern="Yarp.ReverseProxy" />
+      <package pattern="Microsoft.DeveloperControlPlane*" />
+    </packageSource>
+    <packageSource key="dotnet-eng">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+  <disabledPackageSources />
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -30,7 +30,7 @@
       <Sha>5173daa9d8649d3b1af7025adc0d3431a2b7434b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Http.Resilience" Version="8.0.0">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
+      <Uri>https://github.com/dotnet/extensions</Uri>
       <Sha>0db4832a73bcd20fe6eaaa01ff64d18e329d438d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23516.4">
@@ -39,75 +39,75 @@
       <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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</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>
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>59edaad404d1b8e47080015ae8d0787f94c970df</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.OpenApi" Version="8.0.0">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Uri>https://github.com/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>
+      <Uri>https://github.com/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>
+      <Uri>https://github.com/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>
+      <Uri>https://github.com/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>
+      <Uri>https://github.com/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>
+      <Uri>https://github.com/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>
+      <Uri>https://github.com/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>
+      <Uri>https://github.com/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>
+      <Uri>https://github.com/dotnet/efcore</Uri>
       <Sha>e017dc125bef2f604f85befd8ff27544a5a67c38</Sha>
     </Dependency>
   </ProductDependencies>

diff --git a/eng/pipelines/azure-pipelines.yml b/eng/pipelines/azure-pipelines.yml
@@ -64,8 +64,12 @@ stages:
       - job: windows
         timeoutInMinutes: 60
         pool:
-          name: $(DncEngInternalBuildPool)
-          demands: ImageOverride -equals 1es-windows-2022
+          ${{ if eq(variables['System.TeamProject'], 'public') }}:
+            name: $(DncEngPublicBuildPool)
+            demands: ImageOverride -equals windows.vs2022preview.amd64.open
+          ${{ else }}:
+            name: $(DncEngInternalBuildPool)
+            demands: ImageOverride -equals 1es-windows-2022
         strategy:
           matrix:
             release:
@@ -75,14 +79,6 @@ 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
@@ -122,14 +118,6 @@ 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