Skip to content

Commit c624db4

Browse files
authored
Merge pull request #272 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents f9484b1 + b2f32de commit c624db4

File tree

7 files changed

+52
-9
lines changed

7 files changed

+52
-9
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"rollForward": false
1818
},
1919
"nbgv": {
20-
"version": "3.7.112",
20+
"version": "3.7.115",
2121
"commands": [
2222
"nbgv"
2323
],

.github/dependabot.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Please see the documentation for all configuration options:
2+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
3+
4+
version: 2
5+
updates:
6+
- package-ecosystem: nuget
7+
directory: /
8+
schedule:
9+
interval: weekly
10+
groups:
11+
nerdbank-gitversioning:
12+
patterns:
13+
- nbgv
14+
- nerdbank.gitversioning
15+
xunit:
16+
patterns:
17+
- 'xunit*'
18+
- package-ecosystem: dotnet-sdk
19+
directory: /
20+
schedule:
21+
interval: monthly
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: 📃 Docfx Validate
2+
3+
on:
4+
pull_request:
5+
workflow_dispatch:
6+
7+
jobs:
8+
build:
9+
name: 📚 docfx
10+
runs-on: ubuntu-22.04
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
15+
- name: ⚙ Install prerequisites
16+
run: |
17+
./init.ps1 -UpgradePrerequisites
18+
dotnet --info
19+
shell: pwsh
20+
- name: 📚 Verify docfx build
21+
run: dotnet docfx docfx/docfx.json --warningsAsErrors --disableGitFeatures
22+
if: runner.os == 'Linux'

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<ItemGroup Label="Library.Template">
1515
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1616
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
17-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
18-
<PackageVersion Include="xunit.v3" Version="1.0.0" />
17+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
18+
<PackageVersion Include="xunit.v3" Version="1.0.1" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<!-- Put repo-specific GlobalPackageReference items in this group. -->
@@ -25,7 +25,7 @@
2525
<GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
2626
<GlobalPackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" />
2727
<!-- The condition works around https://github.com/dotnet/sdk/issues/44951 -->
28-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.112" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
28+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
2929
<GlobalPackageReference Include="PolySharp" Version="1.15.0" />
3030
<GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
3131
</ItemGroup>

azure-pipelines/OptProf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ stages:
9090
packagesToPush: $(Agent.TempDirectory)/VSInsertion-Windows/*.nupkg
9191
publishVstsFeed: 97a41293-2972-4f48-8c0e-05493ae82010 # VS feed
9292
allowPackageConflicts: true
93-
- task: MicroBuildInsertVsPayload@4
93+
- task: MicroBuildInsertVsPayload@5
9494
displayName: Insert VS Payload
9595
inputs:
9696
TeamName: $(TeamName)

azure-pipelines/vs-insertion.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ extends:
5454
packageParentPath: $(Pipeline.Workspace)/CI/VSInsertion-Windows
5555
allowPackageConflicts: true
5656
publishVstsFeed: VS
57-
- task: MicroBuildInsertVsPayload@4
57+
- task: MicroBuildInsertVsPayload@5
5858
displayName: 🏭 Insert VS Payload
5959
inputs:
6060
TeamName: $(TeamName)
6161
TeamEmail: $(TeamEmail)
6262
InsertionPayloadName: $(Build.Repository.Name) $(Build.BuildNumber)
63-
InsertionBuildPolicy: Request Perf DDRITs
63+
InsertionBuildPolicies: Request Perf DDRITs
6464
InsertionReviewers: $(Build.RequestedFor),Andrew Arnott
6565
AutoCompletePR: true
6666
AutoCompleteMergeStrategy: Squash

azure-pipelines/vs-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ extends:
8787
packageParentPath: $(Pipeline.Workspace)/VSInsertion-Windows
8888
allowPackageConflicts: true
8989
publishVstsFeed: VS
90-
- task: MicroBuildInsertVsPayload@4
90+
- task: MicroBuildInsertVsPayload@5
9191
displayName: 🏭 Insert VS Payload
9292
inputs:
9393
TeamName: $(TeamName)
@@ -96,7 +96,7 @@ extends:
9696
InsertionDescription: |
9797
This PR is for **validation purposes only** for !$(System.PullRequest.PullRequestId). **Do not complete**.
9898
CustomScriptExecutionCommand: src/VSSDK/NuGet/AllowUnstablePackages.ps1
99-
InsertionBuildPolicy: Request Perf DDRITs
99+
InsertionBuildPolicies: Request Perf DDRITs
100100
InsertionReviewers: $(Build.RequestedFor)
101101
DraftPR: false # set to true and update InsertionBuildPolicy when we can specify all the validations we want to run (https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2224288)
102102
AutoCompletePR: false

0 commit comments

Comments
 (0)