Skip to content

Commit

Permalink
Merging internal commits for release/6.0.4xx (#43981)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmitche
mmitche authored Oct 9, 2024
2 parents 892f82d + 795da3c commit abee3fb
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 149 deletions.
6 changes: 2 additions & 4 deletions .vsts-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,10 @@ extends:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
image: 1es-windows-2022-open
os: windows
demands: ImageOverride -equals windows.vs2022preview.amd64.open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022
os: windows
demands: ImageOverride -equals windows.vs2022preview.amd64
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
Expand Down
54 changes: 8 additions & 46 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,21 @@
<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-f0f9de5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-f0f9de5-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-827b960" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-8413a0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-8413a0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-7de8a28" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand All @@ -57,35 +38,16 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-8413a0d-1" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-2" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-3" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-4" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-5" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-6" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-7" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-8" value="true" />
<add key="darc-int-dotnet-templating-8413a0d-9" value="true" />
<add key="darc-int-dotnet-templating-8413a0d" value="true" />
<add key="darc-int-dotnet-templating-7de8a28" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-f0f9de5-5" value="true" />
<add key="darc-int-dotnet-aspnetcore-f0f9de5" value="true" />
<add key="darc-int-dotnet-aspnetcore-827b960" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-4" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-5" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-6" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-7" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-8" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-9" value="true" />
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
Loading

0 comments on commit abee3fb

Please sign in to comment.