Skip to content

Commit d2f60f2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Merging main into darc-main-6a483e62-9a15-475d-a31b-7c7d1c96cb9f
2 parents 858e7a4 + d9960a9 commit d2f60f2

File tree

7 files changed

+353
-51
lines changed

7 files changed

+353
-51
lines changed

‎.github/workflows/update-man-pages.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Update man-pages workflow
2+
on:
3+
schedule:
4+
- cron: "42 3 1/15 * *" # Trigger every 15 days at 03:42
5+
#- cron: "0,5,10,15,20,25,30,35,40,45,50,55 * * * *" # For testing
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
update-man-pages:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout repository code
16+
uses: actions/checkout@v4
17+
18+
- name: Update man-pages
19+
run: |
20+
set -euo pipefail
21+
22+
rm ./documentation/manpages/sdk/*
23+
24+
./documentation/manpages/tool/run_docker.sh
25+
26+
if [[ -n $(git status -s) ]]; then
27+
git config user.name 'github-actions'
28+
git config user.email '[email protected]'
29+
date=$(date +%F)
30+
git add .
31+
title="[automated] Update man pages"
32+
body="This action is executed twice a month to automatically update the manpages based on the latest changes to the dotnet/docs repo"
33+
branch=update-man-page-$date
34+
git checkout -b $branch
35+
git commit -a -m "$title"
36+
git push -u origin $branch --force
37+
gh pr create --base main --head $branch --title "$title" --body "$body"
38+
fi
39+
env:
40+
GH_TOKEN: ${{ github.token }}

‎.vsts-ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ parameters:
2121
- name: runTestBuild
2222
displayName: Run A Test Build
2323
type: boolean
24-
default: false
24+
default: true
2525
- name: enableArm64Job
2626
displayName: Enables the ARM64 job
2727
type: boolean
@@ -290,15 +290,16 @@ extends:
290290
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
291291

292292
############### PUBLISH STAGE ###############
293-
- ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
293+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
294294
- stage: publish
295295
displayName: Publish
296-
dependsOn: build
296+
dependsOn: []
297297
jobs:
298298
- template: /eng/common/templates-official/job/publish-build-assets.yml@self
299299
parameters:
300300
publishUsingPipelines: true
301301
publishAssetsImmediately: true
302+
isAssetlessBuild: true
302303
pool:
303304
name: $(DncEngInternalBuildPool)
304305
image: 1es-windows-2022

‎documentation/manpages/tool/update-man-pages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ ls docs-main/docs/core/tools/dotnet*.md | while read -r file;
5555
"$file" -o "${command_name}"."${man_page_section}"
5656
done
5757

58-
# rm -rf docs-main
58+
rm -rf docs-main

‎eng/Version.Details.xml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -117,74 +117,74 @@
117117
<Uri>https://github.com/dotnet/dotnet</Uri>
118118
<Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
119119
</Dependency>
120-
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.60">
120+
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.65">
121121
<Uri>https://github.com/nuget/nuget.client</Uri>
122-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
122+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
123123
</Dependency>
124-
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.60">
124+
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.65">
125125
<Uri>https://github.com/nuget/nuget.client</Uri>
126-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
126+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
127127
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
128128
</Dependency>
129-
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.60">
129+
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.65">
130130
<Uri>https://github.com/nuget/nuget.client</Uri>
131-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
131+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
132132
</Dependency>
133-
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.60">
133+
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.65">
134134
<Uri>https://github.com/nuget/nuget.client</Uri>
135-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
135+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
136136
</Dependency>
137-
<Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.60">
137+
<Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.65">
138138
<Uri>https://github.com/nuget/nuget.client</Uri>
139-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
139+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
140140
</Dependency>
141-
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.60">
141+
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.65">
142142
<Uri>https://github.com/nuget/nuget.client</Uri>
143-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
143+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
144144
</Dependency>
145-
<Dependency Name="NuGet.Common" Version="6.15.0-preview.1.60">
145+
<Dependency Name="NuGet.Common" Version="6.15.0-preview.1.65">
146146
<Uri>https://github.com/nuget/nuget.client</Uri>
147-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
147+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
148148
</Dependency>
149-
<Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.60">
149+
<Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.65">
150150
<Uri>https://github.com/nuget/nuget.client</Uri>
151-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
151+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
152152
</Dependency>
153-
<Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.60">
153+
<Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.65">
154154
<Uri>https://github.com/nuget/nuget.client</Uri>
155-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
155+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
156156
</Dependency>
157-
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.60">
157+
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.65">
158158
<Uri>https://github.com/nuget/nuget.client</Uri>
159-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
159+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
160160
</Dependency>
161-
<Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.60">
161+
<Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.65">
162162
<Uri>https://github.com/nuget/nuget.client</Uri>
163-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
163+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
164164
</Dependency>
165-
<Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.60">
165+
<Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.65">
166166
<Uri>https://github.com/nuget/nuget.client</Uri>
167-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
167+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
168168
</Dependency>
169-
<Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.60">
169+
<Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.65">
170170
<Uri>https://github.com/nuget/nuget.client</Uri>
171-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
171+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
172172
</Dependency>
173-
<Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.60">
173+
<Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.65">
174174
<Uri>https://github.com/nuget/nuget.client</Uri>
175-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
175+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
176176
</Dependency>
177-
<Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.60">
177+
<Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.65">
178178
<Uri>https://github.com/nuget/nuget.client</Uri>
179-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
179+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
180180
</Dependency>
181-
<Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.60">
181+
<Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.65">
182182
<Uri>https://github.com/nuget/nuget.client</Uri>
183-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
183+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
184184
</Dependency>
185-
<Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.60">
185+
<Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.65">
186186
<Uri>https://github.com/nuget/nuget.client</Uri>
187-
<Sha>1ad595b19f540ede0ea634ff6d0ef815c16698bf</Sha>
187+
<Sha>58c248e36695c9586c486e8876a43046e0817d41</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.15.0-preview-25272-109">
190190
<Uri>https://github.com/dotnet/dotnet</Uri>

‎eng/Versions.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,18 @@
155155
</PropertyGroup>
156156
<PropertyGroup>
157157
<!-- Dependencies from https://github.com/nuget/nuget.client -->
158-
<NuGetBuildTasksPackageVersion>6.15.0-preview.1.60</NuGetBuildTasksPackageVersion>
159-
<NuGetBuildTasksConsolePackageVersion>6.15.0-preview.1.60</NuGetBuildTasksConsolePackageVersion>
160-
<NuGetLocalizationPackageVersion>6.15.0-preview.1.60</NuGetLocalizationPackageVersion>
161-
<NuGetBuildTasksPackPackageVersion>6.15.0-preview.1.60</NuGetBuildTasksPackPackageVersion>
162-
<NuGetCommandLineXPlatPackageVersion>6.15.0-preview.1.60</NuGetCommandLineXPlatPackageVersion>
163-
<NuGetProjectModelPackageVersion>6.15.0-preview.1.60</NuGetProjectModelPackageVersion>
164-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.15.0-preview.1.60</MicrosoftBuildNuGetSdkResolverPackageVersion>
165-
<NuGetCommonPackageVersion>6.15.0-preview.1.60</NuGetCommonPackageVersion>
166-
<NuGetConfigurationPackageVersion>6.15.0-preview.1.60</NuGetConfigurationPackageVersion>
167-
<NuGetFrameworksPackageVersion>6.15.0-preview.1.60</NuGetFrameworksPackageVersion>
168-
<NuGetPackagingPackageVersion>6.15.0-preview.1.60</NuGetPackagingPackageVersion>
169-
<NuGetVersioningPackageVersion>6.15.0-preview.1.60</NuGetVersioningPackageVersion>
158+
<NuGetBuildTasksPackageVersion>6.15.0-preview.1.65</NuGetBuildTasksPackageVersion>
159+
<NuGetBuildTasksConsolePackageVersion>6.15.0-preview.1.65</NuGetBuildTasksConsolePackageVersion>
160+
<NuGetLocalizationPackageVersion>6.15.0-preview.1.65</NuGetLocalizationPackageVersion>
161+
<NuGetBuildTasksPackPackageVersion>6.15.0-preview.1.65</NuGetBuildTasksPackPackageVersion>
162+
<NuGetCommandLineXPlatPackageVersion>6.15.0-preview.1.65</NuGetCommandLineXPlatPackageVersion>
163+
<NuGetProjectModelPackageVersion>6.15.0-preview.1.65</NuGetProjectModelPackageVersion>
164+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.15.0-preview.1.65</MicrosoftBuildNuGetSdkResolverPackageVersion>
165+
<NuGetCommonPackageVersion>6.15.0-preview.1.65</NuGetCommonPackageVersion>
166+
<NuGetConfigurationPackageVersion>6.15.0-preview.1.65</NuGetConfigurationPackageVersion>
167+
<NuGetFrameworksPackageVersion>6.15.0-preview.1.65</NuGetFrameworksPackageVersion>
168+
<NuGetPackagingPackageVersion>6.15.0-preview.1.65</NuGetPackagingPackageVersion>
169+
<NuGetVersioningPackageVersion>6.15.0-preview.1.65</NuGetVersioningPackageVersion>
170170
</PropertyGroup>
171171
<PropertyGroup>
172172
<!-- Dependencies from https://github.com/Microsoft/vstest -->

‎test/dotnet-new.IntegrationTests/DotnetNewSearchTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ public void CanFilterAuthor(string testCase)
220220
Assert.True(AtLeastOneRowIsNotEmpty(tableOutput, "Downloads"), "'Downloads' column contains empty values");
221221
}
222222

223-
[Theory]
223+
#pragma warning disable xUnit1004
224+
[Theory(Skip = "https://github.com/dotnet/sdk/issues/49123")]
225+
#pragma warning restore xUnit1004
224226
[InlineData("--search --columns author --author micro")]
225227
[InlineData("search --columns author --author micro")]
226228
public void CanFilterAuthor_WithoutName(string testCase)

0 commit comments

Comments
 (0)