Skip to content

Commit 0e9adbe

Browse files
authored
Merge pull request #1403 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents dbd8dc2 + 3b02914 commit 0e9adbe

File tree

9 files changed

+121
-109
lines changed

9 files changed

+121
-109
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/renovate.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,36 @@
2121
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
2222
"groupName": "Dockerfile and global.json updates"
2323
},
24+
{
25+
"matchPackageNames": [
26+
"System.Collections.Immutable",
27+
"System.Composition*",
28+
"System.Diagnostics.DiagnosticSource",
29+
"System.IO.Pipelines",
30+
"System.Reflection.Metadata",
31+
"System.Text.Json",
32+
"System.Threading.Tasks.Dataflow",
33+
"Microsoft.Bcl.AsyncInterfaces"
34+
],
35+
"allowedVersions": "<9.0",
36+
"groupName": "Included in .NET runtime"
37+
},
2438
{
2539
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
2640
"groupName": "microbuild"
41+
},
42+
{
43+
"matchPackageNames": ["Microsoft.VisualStudio.*"],
44+
"groupName": "Visual Studio SDK"
45+
},
46+
{
47+
"matchPackageNames": ["Microsoft.VisualStudio.*"],
48+
"matchUpdateTypes": ["patch"],
49+
"enabled": false
50+
},
51+
{
52+
"matchJsonata": [ "sharedVariableName='CodeAnalysisVersion'" ],
53+
"enabled": false
2754
}
2855
]
2956
}

.github/workflows/docs_validate.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@ name: 📃 Docfx Validate
33
on:
44
pull_request:
55
workflow_dispatch:
6+
push:
7+
branches:
8+
- main
9+
- microbuild
610

711
jobs:
812
build:
913
name: 📚 Doc validation
10-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1115
steps:
1216
- uses: actions/checkout@v4
1317
with:
1418
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
1519
- name: 🔗 Markup Link Checker (mlc)
16-
uses: becheran/[email protected].0
20+
uses: becheran/[email protected].2
1721
with:
18-
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dev.azure.com/*,https://app.codecov.io/*,https://msrc.microsoft.com/*,https://www.microsoft.com/en-us/msrc* -p docfx -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://www.microsoft.com/msrc/cvd,https://www.microsoft.com/msrc,https://microsoft.sharepoint.com/*
22+
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dotnet.microsoft.com/*,https://dev.azure.com/*,https://app.codecov.io/*,https://badges.gitter.im/*,https://github.com/*,https://app.gitter.im/* -p docfx -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://msrc.microsoft.com/*,https://www.microsoft.com/msrc*,https://microsoft.com/msrc*,https://microsoft.sharepoint.com/*
1923
- name: ⚙ Install prerequisites
2024
run: |
2125
./init.ps1 -UpgradePrerequisites

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For significant changes we strongly recommend opening an issue to start a design
1919

2020
* [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core/2.2) with the version matching our [global.json](global.json) file. The version you install must be at least the version specified in the global.json file, and must be within the same hundreds version for the 3rd integer: x.y.Czz (x.y.C must match, and zz must be at least as high).
2121
The easiest way to get this is to run the `init` script at the root of the repo. Use the `-InstallLocality Machine` and approve admin elevation if you wish so the SDK is always discoverable from VS. See the `init` script usage doc for more details.
22-
* Optional: [Visual Studio 2019](https://www.visualstudio.com/)
22+
* Optional: [Visual Studio 2022](https://visualstudio.microsoft.com/)
2323

2424
The only prerequisite for building, testing, and deploying from this repository
2525
is the [.NET SDK](https://get.dot.net/).

Directory.Packages.props

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<PropertyGroup>
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
7-
<MicroBuildVersion>2.0.171</MicroBuildVersion>
7+
<MicroBuildVersion>2.0.181</MicroBuildVersion>
88
<CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
9-
<CodeAnalysisVersion Condition="'$(IsTestProject)'=='true'">4.4.0</CodeAnalysisVersion>
9+
<CodeAnalysisVersionForTests>4.4.0</CodeAnalysisVersionForTests>
1010
<CodefixTestingVersion>1.1.2</CodefixTestingVersion>
1111
<MicrosoftDiagnosticsRuntimeVersion>3.1.525101</MicrosoftDiagnosticsRuntimeVersion>
1212
<CodeAnalysisAnalyzerVersion>3.11.0-beta1.24527.2</CodeAnalysisAnalyzerVersion>
@@ -43,6 +43,12 @@
4343
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
4444
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
4545
</ItemGroup>
46+
<ItemGroup Condition="'$(IsTestProject)'=='true'">
47+
<PackageVersion Update="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersionForTests)" />
48+
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForTests)" />
49+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForTests)" />
50+
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersionForTests)" />
51+
</ItemGroup>
4652
<ItemGroup Label="Library.Template">
4753
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
4854
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
## Microsoft.VisualStudio.Threading
77

8-
[![NuGet package](https://img.shields.io/nuget/v/Microsoft.VisualStudio.Threading.svg)](https://nuget.org/packages/Microsoft.VisualStudio.Threading)
8+
[![NuGet package](https://img.shields.io/nuget/v/Microsoft.VisualStudio.Threading.svg)](https://www.nuget.org/packages/Microsoft.VisualStudio.Threading)
99

1010
Async synchronization primitives, async collections, TPL and dataflow extensions. The JoinableTaskFactory allows synchronously blocking the UI thread for async work. This package is applicable to any .NET application (not just Visual Studio).
1111

@@ -15,7 +15,7 @@ Async synchronization primitives, async collections, TPL and dataflow extensions
1515

1616
## Microsoft.VisualStudio.Threading.Analyzers
1717

18-
[![NuGet package](https://img.shields.io/nuget/v/Microsoft.VisualStudio.Threading.Analyzers.svg)](https://nuget.org/packages/Microsoft.VisualStudio.Threading.Analyzers)
18+
[![NuGet package](https://img.shields.io/nuget/v/Microsoft.VisualStudio.Threading.Analyzers.svg)](https://www.nuget.org/packages/Microsoft.VisualStudio.Threading.Analyzers)
1919

2020
Static code analyzer to detect common mistakes or potential issues regarding threading and async coding.
2121

doc/analyzers/VSTHRD010.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ private async Task CallVSAsync()
5858
}
5959
```
6060

61-
Refer to [Asynchronous and multithreaded programming within VS using the JoinableTaskFactory](http://blogs.msdn.com/b/andrewarnottms/archive/2014/05/07/asynchronous-and-multithreaded-programming-within-vs-using-the-joinabletaskfactory/) for more info.
61+
Refer to [Asynchronous and multithreaded programming within VS using the JoinableTaskFactory](https://devblogs.microsoft.com/premier-developer/asynchronous-and-multithreaded-programming-within-vs-using-the-joinabletaskfactory/) for more info.

0 commit comments

Comments
 (0)