Skip to content

Commit 88ad777

Browse files
authored
Merge pull request #361 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents c95b9ba + ce34922 commit 88ad777

23 files changed

+60
-562
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"powershell": {
6-
"version": "7.5.2",
6+
"version": "7.5.3",
77
"commands": [
88
"pwsh"
99
],
@@ -17,7 +17,7 @@
1717
"rollForward": false
1818
},
1919
"nbgv": {
20-
"version": "3.7.115",
20+
"version": "3.8.118",
2121
"commands": [
2222
"nbgv"
2323
],

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
2-
FROM mcr.microsoft.com/dotnet/sdk:9.0.304-noble@sha256:0b7186a7247bf8c07085fd700613bb0425a6f8f6467a0342c12a535e767da803
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.305-noble@sha256:604ef064c6d91068eeb9d946036d8ffadbe25589c4cd77a230fc96e0f6d01d72
33

44
# Installing mono makes `dotnet test` work without errors even for net472.
55
# But installing it takes a long time, so it's excluded by default.

.github/workflows/docs_validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: 🔗 Markup Link Checker (mlc)
2020
uses: becheran/mlc@18a06b3aa2901ca197de59c8b0b1f54fdba6b3fa # v1.0.0
2121
with:
22-
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
22+
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.npmjs.com/package/*,https://get.dot.net/,https://www.microsoft.com/legal/intellectualproperty/trademarks/usage/general
2323
- name: ⚙ Install prerequisites
2424
run: |
2525
./init.ps1 -UpgradePrerequisites

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33
##
4-
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
4+
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
55

66
# User-specific files
77
*.rsuser

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Trigger the pipeline by adding the `auto-release` tag on a run of your main `azu
105105

106106
## Tutorial and API documentation
107107

108-
API and hand-written docs are found under the `docfx/` directory. and are built by [docfx](https://dotnet.github.io/docfx/).
108+
API and hand-written docs are found under the `docfx/` directory and are built by [docfx](https://dotnet.github.io/docfx/).
109109

110110
You can make changes and host the site locally to preview them by switching to that directory and running the `dotnet docfx --serve` command.
111111
After making a change, you can rebuild the docs site while the localhost server is running by running `dotnet docfx` again from a separate terminal.
@@ -127,7 +127,7 @@ If Renovate is not creating pull requests when you expect it to, check that the
127127
### Maintaining your repo based on this template
128128

129129
The best way to keep your repo in sync with Library.Template's evolving features and best practices is to periodically merge the template into your repo:
130-
`
130+
131131
```ps1
132132
git fetch
133133
git checkout origin/main

Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\$(MSBuildProjectName)\</BaseOutputPath>
88
<PackageOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>
99
<VSIXOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\Vsix\$(Platform)\</VSIXOutputPath>
10+
<VSIXOutputPath Condition="'$(Platform)'=='' or '$(Platform)'=='AnyCPU'">$(RepoRootPath)bin\Packages\$(Configuration)\Vsix\</VSIXOutputPath>
1011
<SBOMFileDestPath>$(VSIXOutputPath)</SBOMFileDestPath>
1112
<Nullable>enable</Nullable>
1213
<ImplicitUsings>enable</ImplicitUsings>
@@ -15,6 +16,9 @@
1516
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1617
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
1718

19+
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/apicompat/package-validation/overview -->
20+
<EnablePackageValidation>true</EnablePackageValidation>
21+
1822
<!-- https://github.com/dotnet/msbuild/blob/main/documentation/ProjectReference-Protocol.md#setplatform-negotiation -->
1923
<EnableDynamicPlatformResolution>true</EnableDynamicPlatformResolution>
2024

Directory.Packages.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
77

8-
<MicroBuildVersion>2.0.199</MicroBuildVersion>
8+
<MicroBuildVersion>2.0.201</MicroBuildVersion>
99
<CodeAnalysisVersion>4.12.0</CodeAnalysisVersion>
1010
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24324.1</MicrosoftCodeAnalysisAnalyzersVersion>
1111
<CodefixTestingVersion>1.1.2</CodefixTestingVersion>
@@ -17,7 +17,6 @@
1717
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersion)" />
1818
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
1919
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
20-
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
2120
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersion)" />
2221
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
2322
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
@@ -58,7 +57,7 @@
5857
<GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
5958
<GlobalPackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" />
6059
<!-- The condition works around https://github.com/dotnet/sdk/issues/44951 -->
61-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
60+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.8.118" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
6261
<GlobalPackageReference Include="PolySharp" Version="1.15.0" Condition="'$(DoNotReferenceNullable)'!='true'" />
6362
<GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
6463
</ItemGroup>

Microsoft.ServiceBroker.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Solution>
22
<Folder Name="/Solution Items/">
3+
<File Path=".config/dotnet-tools.json" />
34
<File Path=".editorconfig" />
45
<File Path=".github/renovate.json" />
56
<File Path="Directory.Build.props" />

azure-pipelines/apiscan.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ jobs:
4949
isLargeApp: false
5050
toolVersion: Latest
5151
preserveLogsFolder: true
52+
azureSubscription: VSEng-APIScanSC
5253
env:
53-
AzureServicesAuthConnectionString: runAs=App;AppId=$(ApiScanClientId)
54+
AzureServicesAuthConnectionString: $(APIScanAuthConnectionString)
55+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
5456

5557
# File bugs when APIScan finds issues
5658
- task: TSAUpload@2

azure-pipelines/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ jobs:
123123
signType: test
124124
sbom:
125125
enabled: true
126+
sbomToolVersion: 5.0.3
126127
localization:
127128
enabled: ${{ parameters.EnableLocalization }}
128129
${{ if eq(variables['Build.Reason'], 'pullRequest') }}:

0 commit comments

Comments
 (0)