Skip to content

Commit eba669f

Browse files
authored
Merge branch 'release/8.0.1xx' into backport/pr-46186-to-release/8.0.1xx
2 parents 480e37c + 31e7f76 commit eba669f

File tree

7 files changed

+193
-162
lines changed

7 files changed

+193
-162
lines changed

.github/workflows/pr-analysis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: PR Analysis
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, labeled, unlabeled]
5+
permissions:
6+
contents: read
7+
pull-requests: read
8+
jobs:
9+
allowed-labels:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Return error if branch is in lockdown or 'do not merge' label is present
13+
run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1
14+
if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }}

NuGet.config

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,21 @@
2121
<add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-format -->
2323
<!-- Begin: Package sources from dotnet-aspnetcore -->
24-
<add key="darc-int-dotnet-aspnetcore-31d685b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-aspnetcore-31d685b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-3/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
2825
<!-- End: Package sources from dotnet-aspnetcore -->
2926
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
30-
<add key="darc-pub-DotNet-msbuild-Trusted-31744df" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-31744dfc/nuget/v3/index.json" />
27+
<add key="darc-pub-DotNet-msbuild-Trusted-c3ade83" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c3ade832/nuget/v3/index.json" />
3128
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3229
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3330
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3431
<!-- Begin: Package sources from dotnet-runtime -->
35-
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
3733
<!-- End: Package sources from dotnet-runtime -->
3834
<!-- Begin: Package sources from dotnet-templating -->
39-
<add key="darc-pub-dotnet-templating-335a66e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-335a66ef/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-templating-a977119" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e/nuget/v3/index.json" />
4036
<!-- End: Package sources from dotnet-templating -->
4137
<!-- Begin: Package sources from dotnet-windowsdesktop -->
42-
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
43-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
44-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
45-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
38+
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />
4639
<!-- End: Package sources from dotnet-windowsdesktop -->
4740
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4841
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -67,10 +60,7 @@
6760
<!-- Begin: Package sources from dotnet-templating -->
6861
<!-- End: Package sources from dotnet-templating -->
6962
<!-- Begin: Package sources from dotnet-aspnetcore -->
70-
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="true" />
71-
<add key="darc-int-dotnet-aspnetcore-31d685b-2" value="true" />
72-
<add key="darc-int-dotnet-aspnetcore-31d685b-3" value="true" />
73-
<add key="darc-int-dotnet-aspnetcore-31d685b" value="true" />
63+
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
7464
<!-- End: Package sources from dotnet-aspnetcore -->
7565
<!-- Begin: Package sources from dotnet-format -->
7666
<add key="darc-int-dotnet-format-27f1865-1" value="true" />
@@ -85,14 +75,10 @@
8575
<!-- End: Package sources from dotnet-format -->
8676
<!-- End: Package sources from dotnet-aspnetcore -->
8777
<!-- Begin: Package sources from dotnet-runtime -->
88-
<add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
89-
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
78+
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
9079
<!-- End: Package sources from dotnet-runtime -->
9180
<!-- Begin: Package sources from dotnet-windowsdesktop -->
92-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
93-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
94-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
95-
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
81+
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
9682
<!-- End: Package sources from dotnet-windowsdesktop -->
9783
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
9884
</disabledPackageSources>

0 commit comments

Comments
 (0)