Skip to content

Commit e29dd48

Browse files
AArnottAArnott
authored
Merge pull request #330 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents ff5e8a5 + 560c864 commit e29dd48

File tree

8 files changed

+47
-22
lines changed

8 files changed

+47
-22
lines changed

‎.github/renovate.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@
5252
"matchPackageNames": ["MessagePack", "MessagePackAnalyzer"],
5353
"allowedVersions": "<3.0",
5454
"groupName": "MessagePack"
55+
},
56+
{
57+
"matchFileNames": ["Directory.Packages.Analyzers.props"],
58+
"enabled": false
59+
}
60+
],
61+
"customManagers": [
62+
{
63+
"customType": "regex",
64+
"datasourceTemplate": "nuget",
65+
"fileMatch": ["test/Microsoft.ServiceHub.Analyzers.Tests/Helpers/ReferencesHelper.cs"],
66+
"matchStrings": ["PackageIdentity\\(\"(?<packageName>[^\"]+)\", \"(?<currentValue>[^\"]+)\"\\)"]
5567
}
5668
]
5769
}

‎.github/workflows/docs_validate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
1919
- name: 🔗 Markup Link Checker (mlc)
20-
uses: becheran/mlc@v0.19.2
20+
uses: becheran/mlc@v0.21.0
2121
with:
2222
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dotnet.microsoft.com/*,https://dev.azure.com/*,https://app.codecov.io/* -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://www.microsoft.com/legal/intellectualproperty/trademarks/usage/general
2323
- name: ⚙ Install prerequisites

‎Directory.Build.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
</ItemGroup>
1515

1616
<Import Project="azure-pipelines\NuGetSbom.targets" Condition="'$(IsPackable)'!='false'" />
17+
<Import Project="Directory.Packages.Analyzers.props" Condition="'$(IsAnalyzerProject)'=='true'" />
1718
</Project>

‎Directory.Packages.Analyzers.props‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project>
2+
<PropertyGroup>
3+
<CodeAnalysisVersionForAnalyzers>3.11.0</CodeAnalysisVersionForAnalyzers>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- These versions carefully chosen to support VS 2019 Update 11. -->
7+
<PackageVersion Update="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersionForAnalyzers)" />
8+
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForAnalyzers)" />
9+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForAnalyzers)" />
10+
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" version="$(CodeAnalysisVersionForAnalyzers)" />
11+
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersionForAnalyzers)" />
12+
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="$(CodeAnalysisVersionForAnalyzers)" />
13+
<PackageVersion Update="System.Collections.Immutable" Version="5.0.0" />
14+
<PackageVersion Update="System.Memory" Version="4.5.4" />
15+
<PackageVersion Update="System.Reflection.Metadata" Version="5.0.0" />
16+
<PackageVersion Update="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
17+
<PackageVersion Update="System.Text.Json" Version="4.7.2" />
18+
</ItemGroup>
19+
</Project>

‎Directory.Packages.props‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
77

8-
<MicroBuildVersion>2.0.181</MicroBuildVersion>
9-
<CodeAnalysisVersionForAnalyzers>3.11.0</CodeAnalysisVersionForAnalyzers>
8+
<MicroBuildVersion>2.0.187</MicroBuildVersion>
109
<CodeAnalysisVersion>4.12.0</CodeAnalysisVersion>
1110
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24324.1</MicrosoftCodeAnalysisAnalyzersVersion>
1211
<CodefixTestingVersion>1.1.2</CodefixTestingVersion>
13-
<VSThreadingVersion>17.10.48</VSThreadingVersion>
12+
<VSThreadingVersion>17.12.19</VSThreadingVersion>
1413
</PropertyGroup>
1514
<ItemGroup>
1615
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersion)" />
@@ -23,34 +22,28 @@
2322
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
2423
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
2524
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.18" />
26-
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.10.21" />
27-
<PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="17.10.40170" />
28-
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Testing" Version="17.5.33627.172" />
29-
<PackageVersion Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit" Version="17.6.32" />
25+
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.12.40391" />
26+
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.12.12" />
27+
<PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="17.12.40391" />
28+
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Testing" Version="17.5.33428.366" />
29+
<PackageVersion Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit" Version="17.11.8" />
30+
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.40392" />
3031
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
3132
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
3233
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="$(VSThreadingVersion)" />
3334
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="$(VSThreadingVersion)" />
3435
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.162" />
3536
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
3637
<PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
37-
<PackageVersion Include="StreamJsonRpc" Version="2.20.11" />
38+
<PackageVersion Include="StreamJsonRpc" Version="2.20.20" />
3839
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
3940
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
4041
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
4142
<PackageVersion Include="TraceSource.ActivityTracing" Version="0.1.201-beta" />
4243
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
4344
</ItemGroup>
44-
<ItemGroup Condition="'$(IsAnalyzerProject)'=='true'">
45-
<!-- Analyzers need to use older references to work in existing C# compilers. -->
46-
<PackageVersion Update="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersionForAnalyzers)" />
47-
<PackageVersion Update="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersionForAnalyzers)" />
48-
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersionForAnalyzers)" />
49-
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersionForAnalyzers)" />
50-
<PackageVersion Update="System.Collections.Immutable" Version="8.0.0" />
51-
</ItemGroup>
5245
<ItemGroup Label="Library.Template">
53-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
46+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
5447
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
5548
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
5649
<PackageVersion Include="xunit" Version="2.9.3" />

‎azure-pipelines/install-dependencies.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ steps:
1111
- template: WIFtoPATauth.yml
1212
parameters:
1313
wifServiceConnectionName: azure-public/vside package pull
14-
deadPATServiceConnectionId: 0ae39abc-4d06-4436-a7b5-865833df49db # azure-public/msft_consumption
14+
deadPATServiceConnectionId: 46f0d4d4-9fff-4c58-a1ab-3b8f97e3b78a # azure-public/msft_consumption_public
1515

1616
- task: NuGetAuthenticate@1
1717
displayName: 🔏 Authenticate NuGet feeds
1818
inputs:
1919
${{ if and(parameters.needsAzurePublicFeeds, eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9')) }}:
20-
nuGetServiceConnections: azure-public/msft_consumption
20+
nuGetServiceConnections: azure-public/msft_consumption_public
2121

2222
# Authenticate if we're running on the azure-public account, and not from a fork.
2323
- ${{ if and(eq(variables['system.collectionId'], '63b6279a-d2f1-4bc3-a21c-db7614e92831'),ne(variables['System.PullRequest.IsFork'], 'true')) }}:

‎nuget.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<packageSources>
77
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
88
<clear />
9-
<add key="msft_consumption" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption/nuget/v3/index.json" />
9+
<add key="msft_consumption_public" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption_public/nuget/v3/index.json" />
1010
</packageSources>
1111
<disabledPackageSources>
1212
<!-- Defend against user or machine level disabling of sources that we list in this file. -->

‎test/Microsoft.ServiceHub.Analyzers.Tests/Helpers/ReferencesHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ internal static class ReferencesHelper
1010
.WithPackages(ImmutableArray.Create(
1111
new PackageIdentity("System.ComponentModel.Composition", "8.0.0"),
1212
new PackageIdentity("System.Threading.Tasks.Extensions", "4.5.4"),
13-
new PackageIdentity("Microsoft.VisualStudio.Threading", "17.10.48"),
13+
new PackageIdentity("Microsoft.VisualStudio.Threading", "17.12.19"),
1414
new PackageIdentity("Microsoft.VisualStudio.Validation", "17.8.8")));
1515
}

0 commit comments

Comments
 (0)