Skip to content

Commit bf2e32d

Browse files
Merge main into darc-main-006a67fa-72b8-42af-bd26-25b490d68184
2 parents 0b24e09 + ec550ce commit bf2e32d

File tree

101 files changed

+1512
-941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1512
-941
lines changed

.github/workflows/stale.yml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,10 @@ on:
33
schedule:
44
- cron: '19 4,16 * * *' # Twice daily at 19 minutes after the hour (random/uncommon time)
55

6-
workflow_dispatch:
7-
# Manual triggering through the GitHub UI, API, or CLI
8-
inputs:
9-
daysBeforeStale:
10-
required: true
11-
default: "1827"
12-
daysBeforeClose:
13-
required: true
14-
default: "30"
15-
operationsPerRun:
16-
required: true
17-
default: "4000"
18-
196
permissions:
207
actions: write # For managing the operation state cache
218
issues: write
9+
pull-requests: write
2210

2311
jobs:
2412
stale:
@@ -29,11 +17,10 @@ jobs:
2917
- uses: actions/stale@v9 # https://github.com/actions/stale/blob/v9/README.md
3018
with:
3119
ascending: true # Process the oldest issues first
32-
stale-issue-label: 'stale'
33-
stale-issue-message: "Due to lack of recent activity, this issue has been labeled as 'stale'. It will be closed if no further activity occurs within 30 more days. Any new comment will remove the label."
34-
close-issue-message: "This issue will now be closed since it has been labeled 'stale' without activity for 30 days."
35-
days-before-stale: ${{ fromJson(inputs.daysBeforeStale || 2192) }} # Default to 6 years if not specified as input
36-
days-before-close: ${{ fromJson(inputs.daysBeforeClose || 30 ) }} # Default to 30 days if not specified as input
37-
days-before-pr-stale: -1 # Do not label PRs as 'stale'
38-
days-before-pr-close: -1 # Do not close PRs labeled as 'stale'
39-
operations-per-run: ${{ fromJson(inputs.operationsPerRun || 4000 )}}
20+
stale-issue-message: "Due to lack of recent activity, this issue has been labeled as 'Stale'. It will be closed if no further activity occurs within 30 more days. Any new comment will remove the label."
21+
stale-pr-message: "Due to lack of recent activity, this PR has been labeled as 'Stale'. It will be closed if no further activity occurs within 7 more days. Any new comment will remove the label."
22+
days-before-issue-stale: 1827 # ~5 years
23+
days-before-issue-close: 30
24+
days-before-pr-stale: 180 # 6 months
25+
days-before-pr-close: 7
26+
operations-per-run: 4000

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
2020
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
2121
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
22+
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
23+
<add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
2224
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
2325
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
2426
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

eng/Version.Details.props

Lines changed: 132 additions & 132 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 265 additions & 265 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
113113
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
114114
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.8</MicrosoftBuildMinimumVersion>
115-
<MinimumVSVersion>17.14</MinimumVSVersion>
115+
<MinimumVSVersion>18.0</MinimumVSVersion>
116116
</PropertyGroup>
117117
<PropertyGroup>
118118
<!-- Dependencies from https://github.com/dotnet/emsdk -->

eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8','9')
160+
$dotnetVersions = @('5','6','7','8','9','10')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8' '9')
102+
DotNetVersions=('5' '6' '7' '8' '9' '10')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
132132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133133
/p:MaestroApiEndpoint=https://maestro.dot.net
134-
/p:OfficialBuildId=$(Build.BuildNumber)
134+
/p:OfficialBuildId=$(OfficialBuildId)
135135
condition: ${{ parameters.condition }}
136136
continueOnError: ${{ parameters.continueOnError }}
137137

eng/common/core-templates/job/source-build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ parameters:
3434
# container and pool.
3535
platform: {}
3636

37-
# Optional list of directories to ignore for component governance scans.
38-
componentGovernanceIgnoreDirectories: []
39-
4037
is1ESPipeline: ''
4138

4239
# If set to true and running on a non-public project,
@@ -97,4 +94,3 @@ jobs:
9794
parameters:
9895
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9996
platform: ${{ parameters.platform }}
100-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

eng/common/core-templates/jobs/source-build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ parameters:
1515
# one job runs on 'defaultManagedPlatform'.
1616
platforms: []
1717

18-
# Optional list of directories to ignore for component governance scans.
19-
componentGovernanceIgnoreDirectories: []
20-
2118
is1ESPipeline: ''
2219

2320
# If set to true and running on a non-public project,
@@ -34,7 +31,6 @@ jobs:
3431
is1ESPipeline: ${{ parameters.is1ESPipeline }}
3532
jobNamePrefix: ${{ parameters.jobNamePrefix }}
3633
platform: ${{ platform }}
37-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
3834
enableInternalSources: ${{ parameters.enableInternalSources }}
3935

4036
- ${{ if eq(length(parameters.platforms), 0) }}:
@@ -43,5 +39,4 @@ jobs:
4339
is1ESPipeline: ${{ parameters.is1ESPipeline }}
4440
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4541
platform: ${{ parameters.defaultManagedPlatform }}
46-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
4742
enableInternalSources: ${{ parameters.enableInternalSources }}

0 commit comments

Comments
 (0)