Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
164ff31
Do not fail on missing LCL files in official builds
AArnott Mar 8, 2025
46e768b
Revert "Avoid `dotnet format` hang"
AArnott Mar 10, 2025
6ed2f36
Consolidate SDL tasks for insertion job
AArnott Mar 10, 2025
65f8440
Disable redundant 1ES SBOM task
AArnott Mar 10, 2025
039ac0b
Put publishing code coverage under a switch
AArnott Mar 10, 2025
845a785
Merge pull request #354 from AArnott/optimizations
AArnott Mar 10, 2025
e1e35f1
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Mar 10, 2025
dcc2963
Drop github release workflow
AArnott Mar 12, 2025
e5d6527
Merge pull request #355 from AArnott/renovate/dockerfile-and-global.j…
renovate[bot] Mar 12, 2025
6307413
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Mar 14, 2025
24a6e2b
Build renovate settings on the best-practices preset (#357)
AArnott Mar 19, 2025
408618f
Update Dockerfile and global.json updates to v9.0.202 (#356)
renovate[bot] Mar 19, 2025
8d800dc
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Mar 19, 2025
b8573cf
Pin dependencies (#358)
renovate[bot] Mar 19, 2025
4569224
Pin mcr.microsoft.com/dotnet/sdk Docker tag to 332e036 (#359)
renovate[bot] Mar 19, 2025
c90816a
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Mar 19, 2025
32fa187
Update mcr.microsoft.com/dotnet/sdk:9.0.202-noble Docker digest to dc…
renovate[bot] Mar 24, 2025
c6c1f8b
Opt in to the new MicroBuild SBOM behavior
matteo-prosperi Mar 27, 2025
e9c5e82
Merge pull request #362 from matteo-prosperi/dev/maprospe/sbom
AArnott Mar 27, 2025
bc06523
Fix unofficial build with SDL tools enabled
matteo-prosperi Mar 27, 2025
5938898
Merge pull request #363 from matteo-prosperi/patch-4
AArnott Mar 28, 2025
01186f5
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Mar 29, 2025
268a3af
Update dependency xunit.v3 to v2 (#353)
renovate[bot] Apr 6, 2025
d4ce11e
Update Dockerfile and global.json updates to v9.0.203 (#364)
renovate[bot] Apr 9, 2025
95d339a
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Apr 11, 2025
2fb29d7
Update docs to use MergeFrom-Template.ps1
AArnott Apr 16, 2025
2ce8c97
Merge branch 'main' into microbuild
AArnott Apr 16, 2025
23cd85a
Fix lang service reporting C# 7.3 errors in Error List
AArnott Apr 22, 2025
3c5a02c
Merge branch 'main' into microbuild
AArnott Apr 22, 2025
095ddc2
Remove remnants of a workaround
AArnott Apr 22, 2025
24fb90c
Share more variable definitions
AArnott Apr 22, 2025
a84dfb3
Avoid CodeQL steps during release
AArnott Apr 22, 2025
5e856e2
Drop stale comment
AArnott Apr 23, 2025
2714b09
Reapply "Avoid `dotnet format` hang"
AArnott Apr 24, 2025
1aa5446
Merge branch 'main' into microbuild
AArnott Apr 24, 2025
a4fb4a4
Another CodeQL skip
AArnott Apr 24, 2025
2345213
Revert "Opt in to the new MicroBuild SBOM behavior" (#365)
AArnott Apr 24, 2025
708a205
Merge remote-tracking branch 'origin/microbuild' into microbuild_trial
AArnott Apr 24, 2025
1a8cb76
Update actions/download-artifact digest to d3f86a1
renovate[bot] Apr 28, 2025
8dc9804
Update dependency powershell to 7.5.1
renovate[bot] Apr 28, 2025
1ddad47
Update mcr.microsoft.com/dotnet/sdk:9.0.203-noble Docker digest to c8…
renovate[bot] Apr 28, 2025
638e0fb
Reapply "Opt in to the new MicroBuild SBOM behavior"
AArnott Apr 29, 2025
2b0f8e2
Merge branch 'microbuild_trial' into microbuild
AArnott Apr 29, 2025
567a574
Deploy SBOMs next to the VSIX they describe
AArnott Apr 30, 2025
508b839
Update xunit (#370)
renovate[bot] May 4, 2025
9d32400
Merge remote-tracking branch 'origin/main' into microbuild
AArnott May 5, 2025
990d9b5
Update SUPPORT.md with links to product support
AArnott May 6, 2025
fd52657
Refine SUPPORT.md wording
AArnott May 6, 2025
8fe4f14
Add support for a repo to hard-code extra SDKs that must be installed
AArnott May 6, 2025
0e0b8be
Merge pull request #371 from AArnott/multipleSDKs
AArnott May 6, 2025
3b421ec
Add script for collecting 3rd party symbol files
AArnott May 7, 2025
37b7f32
Merge branch 'main' into microbuild
AArnott May 8, 2025
5cc3d59
Reapply "Avoid `dotnet format` hang"
AArnott Apr 24, 2025
9e190e7
Merge branch 'main' into microbuild
AArnott May 8, 2025
e84bdc6
Fix 3rd party symbol archival
AArnott May 9, 2025
5ae59c1
Merge branch 'main' into microbuild
AArnott May 9, 2025
56aaaf0
Update Dockerfile and global.json updates to v9.0.300 (#372)
renovate[bot] May 14, 2025
94431e7
Update dependency Microsoft.NET.Test.Sdk to 17.14.0
AArnott May 20, 2025
c028455
Merge branch 'main' into microbuild
AArnott May 20, 2025
08b8fab
Update mcr.microsoft.com/dotnet/sdk:9.0.300-noble Docker digest to 9f…
renovate[bot] May 29, 2025
25a0aa4
Update becheran/mlc action to v0.22.0 (#374)
renovate[bot] May 29, 2025
7974fd3
Update dependency Microsoft.NET.Test.Sdk to 17.14.1
AArnott Jun 3, 2025
ae78ccb
Merge branch 'main' into microbuild
AArnott Jun 3, 2025
0d8cac2
Update becheran/mlc action to v0.22.0
AArnott Jun 5, 2025
e427b3f
Pin actions/checkout
AArnott Jun 5, 2025
df32f51
Update xunit
renovate[bot] Jun 7, 2025
0c41b21
Update Dockerfile and global.json updates to v9.0.301 (#376)
renovate[bot] Jun 11, 2025
4e511af
Add copilot swe agent setup instructions (#377)
AArnott Jun 11, 2025
ebd6a2f
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jun 11, 2025
231dae9
Touch-up name of github workflow
AArnott Jun 11, 2025
f6217c2
Bump MicroBuild to 2.0.198
AArnott Jun 17, 2025
87df227
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jun 17, 2025
0e6d59c
Enable PME signing for Library.Template
Jun 18, 2025
ce93bed
Fix expand-template.yml indentation
AArnott Jun 18, 2025
7830c55
Merge pull request #378 from skylarnam/dev/sknam/pme-signing
AArnott Jun 18, 2025
dd63cb0
Focus binskim on just the binaries we build
AArnott Jun 19, 2025
b432d5e
Build for OptProf with test signed bits
AArnott Jun 20, 2025
1a7db8d
Update mcr.microsoft.com/dotnet/sdk:9.0.301-noble Docker digest to 21…
renovate[bot] Jun 20, 2025
892b907
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jun 20, 2025
f84cb0f
Update mcr.microsoft.com/dotnet/sdk:9.0.301-noble Docker digest to f3…
renovate[bot] Jun 20, 2025
d1219b5
Update dependency powershell to 7.5.2
renovate[bot] Jun 25, 2025
c14a73b
Re-enable static graph nuget restore
AArnott Jun 29, 2025
73b7e11
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jul 1, 2025
5396018
Update becheran/mlc action to v1 (#383)
renovate[bot] Jul 8, 2025
d9522ff
Update mcr.microsoft.com/dotnet/sdk:9.0.301-noble Docker digest to 23…
renovate[bot] Jul 8, 2025
200f811
Update mcr.microsoft.com/dotnet/sdk:9.0.301-noble Docker digest to 4f…
renovate[bot] Jul 8, 2025
0f78e95
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jul 8, 2025
11467d8
Update .NET SDK to v9.0.302
renovate[bot] Jul 9, 2025
68b60df
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jul 9, 2025
eef5eee
Update dependency xunit.v3 to v3 (#387)
renovate[bot] Jul 14, 2025
6b1c4db
Update dependency xunit.runner.visualstudio to 3.1.2 (#386)
renovate[bot] Jul 14, 2025
a075ec8
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jul 14, 2025
43aadc1
Skip CodeQL scanning of test code
AArnott Jul 15, 2025
2102e05
Update mcr.microsoft.com/dotnet/sdk:9.0.302-noble Docker digest to d4…
renovate[bot] Jul 15, 2025
f17cd2a
Run Component Detection explicitly before Notice
pieandcakes Jul 16, 2025
56e2404
Run Component Detection explicitly before Notice (#392)
AArnott Jul 16, 2025
fe71729
Update dependency xunit.runner.visualstudio to 3.1.3
renovate[bot] Jul 16, 2025
77f38d4
Update Dockerfile and global.json updates to v9.0.303 (#394)
renovate[bot] Jul 18, 2025
3d3b0ba
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Jul 23, 2025
b6f67cc
Bump MicroBuildVersion to 2.0.199
AArnott Jul 24, 2025
6483557
Update becheran/mlc action to v1
AArnott Jul 25, 2025
8eb458b
Disable credscan task on unofficial builds
AArnott Jul 26, 2025
28382fd
Update mcr.microsoft.com/dotnet/sdk:9.0.303-noble Docker digest to a9…
renovate[bot] Jul 30, 2025
f9374d9
Pass through System.AccessToken when real signing on non-Windows buil…
tydunkel Jul 30, 2025
6f665e4
Update mcr.microsoft.com/dotnet/sdk:9.0.303-noble Docker digest to 14…
renovate[bot] Jul 31, 2025
d82349d
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Aug 3, 2025
c2b6afa
Update Dockerfile and global.json updates to v9.0.304
renovate[bot] Aug 5, 2025
eb42f5f
Update actions/download-artifact action to v5 (#399)
renovate[bot] Aug 6, 2025
801d690
Update mcr.microsoft.com/dotnet/sdk:9.0.304-noble Docker digest to 1f…
renovate[bot] Aug 6, 2025
193a34a
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Aug 6, 2025
78241e3
Add copilot-instructions.md file
AArnott Aug 9, 2025
5e1fec3
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Aug 9, 2025
28cfd93
Fix up contributing to work better on linux
AArnott Aug 10, 2025
c4de4d0
Add copilot instructions about avoiding unstable tests
AArnott Aug 10, 2025
7f486cc
Update actions/checkout action to v5 (#402)
renovate[bot] Aug 11, 2025
dc3950f
Update xunit
renovate[bot] Aug 16, 2025
6dc6ace
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Aug 16, 2025
04843ad
Update actions/checkout action to v5
AArnott Aug 17, 2025
90069e4
Update mcr.microsoft.com/dotnet/sdk:9.0.304-noble Docker digest to 0b…
renovate[bot] Aug 20, 2025
640b1d1
Update actions/upload-pages-artifact action to v4 (#405)
renovate[bot] Aug 22, 2025
3c0717a
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Aug 25, 2025
6e77b79
Move GitHub workflow token permissions to per-job
AArnott Aug 25, 2025
ef68ecc
Merge remote-tracking branch 'origin/main' into microbuild
AArnott Aug 28, 2025
3c9a9fa
Move Install-NuGetPackage.ps1 to the tools folder
AArnott Aug 28, 2025
53aebc9
Update hyperlinks to learn.microsoft.com
AArnott Sep 5, 2025
af9d6a5
Merge branch 'main' into microbuild
AArnott Sep 5, 2025
8cf1387
Update hyperlinks to learn.microsoft.com
AArnott Sep 5, 2025
af046b1
Merge the microbuild branch from https://github.com/aarnott/Library.T…
AArnott Sep 5, 2025
70b8793
Merge branch 'main' into dev/andarno/libtemplateUpdate
AArnott Sep 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"powershell": {
"version": "7.5.0",
"version": "7.5.2",
"commands": [
"pwsh"
],
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
FROM mcr.microsoft.com/dotnet/sdk:9.0.200-noble
FROM mcr.microsoft.com/dotnet/sdk:9.0.304-noble@sha256:0b7186a7247bf8c07085fd700613bb0425a6f8f6467a0342c12a535e767da803

# Installing mono makes `dotnet test` work without errors even for net472.
# But installing it takes a long time, so it's excluded by default.
Expand Down
14 changes: 7 additions & 7 deletions .github/actions/publish-artifacts/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,46 +14,46 @@ runs:

- name: 📢 Upload project.assets.json files
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: projectAssetsJson-${{ runner.os }}
path: ${{ runner.temp }}/_artifacts/projectAssetsJson
continue-on-error: true
- name: 📢 Upload variables
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: variables-${{ runner.os }}
path: ${{ runner.temp }}/_artifacts/Variables
continue-on-error: true
- name: 📢 Upload build_logs
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: build_logs-${{ runner.os }}
path: ${{ runner.temp }}/_artifacts/build_logs
continue-on-error: true
- name: 📢 Upload testResults
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: testResults-${{ runner.os }}
path: ${{ runner.temp }}/_artifacts/testResults
continue-on-error: true
- name: 📢 Upload coverageResults
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: coverageResults-${{ runner.os }}
path: ${{ runner.temp }}/_artifacts/coverageResults
continue-on-error: true
- name: 📢 Upload symbols
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: symbols-${{ runner.os }}
path: ${{ runner.temp }}/_artifacts/symbols
continue-on-error: true
- name: 📢 Upload deployables
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: deployables-${{ runner.os }}
path: ${{ runner.temp }}/_artifacts/deployables
Expand Down
23 changes: 23 additions & 0 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copilot instructions for this repository

## High level guidance

* Review the `CONTRIBUTING.md` file for instructions to build and test the software.
* Set the `NBGV_GitEngine` environment variable to `Disabled` before running any `dotnet` or `msbuild` commands.

## Software Design

* Design APIs to be highly testable, and all functionality should be tested.
* Avoid introducing binary breaking changes in public APIs of projects under `src` unless their project files have `IsPackable` set to `false`.

## Testing

* There should generally be one test project (under the `test` directory) per shipping project (under the `src` directory). Test projects are named after the project being tested with a `.Test` suffix.
* Tests should use the Xunit testing framework.
* Some tests are known to be unstable. When running tests, you should skip the unstable ones by running `dotnet test --filter "TestCategory!=FailsInCloudTest"`.

## Coding style

* Honor StyleCop rules and fix any reported build warnings *after* getting tests to pass.
* In C# files, use namespace *statements* instead of namespace *blocks* for all new files.
* Add API doc comments to all new public and internal members.
41 changes: 41 additions & 0 deletions .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: 💪🏼 Copilot Setup Steps

# Automatically run the setup steps when they are changed to allow for easy validation, and
# allow manual testing through the repository's "Actions" tab
on:
workflow_dispatch:
push:
branches:
- main
paths:
- .github/workflows/copilot-setup-steps.yml
pull_request:
paths:
- .github/workflows/copilot-setup-steps.yml

jobs:
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
copilot-setup-steps:
runs-on: ubuntu-latest
# Set the permissions to the lowest permissions possible needed for your steps.
# Copilot will be given its own token for its operations.
permissions:
# If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
contents: read

# You can define any steps you want, and they will run before the agent starts.
# If you do not check out your code, Copilot will do this for you.
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
- name: ⚙ Install prerequisites
run: |
./init.ps1 -UpgradePrerequisites -NoNuGetCredProvider
dotnet --info

# Print mono version if it is present.
if (Get-Command mono -ErrorAction SilentlyContinue) {
mono --version
}
shell: pwsh
19 changes: 9 additions & 10 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ on:
branches:
- main

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
actions: read
pages: write
id-token: write
contents: read

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
Expand All @@ -20,12 +13,18 @@ concurrency:

jobs:
publish-docs:
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
actions: read
pages: write
id-token: write
contents: read
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
- name: ⚙ Install prerequisites
Expand All @@ -35,10 +34,10 @@ jobs:
name: 📚 Generate documentation

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
with:
path: docfx/_site

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
4 changes: 2 additions & 2 deletions .github/workflows/docs_validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
name: 📚 Doc validation
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
- name: 🔗 Markup Link Checker (mlc)
uses: becheran/mlc@v0.21.0
uses: becheran/mlc@18a06b3aa2901ca197de59c8b0b1f54fdba6b3fa # v1.0.0
with:
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*
- name: ⚙ Install prerequisites
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/libtemplate-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.

Expand Down
88 changes: 0 additions & 88 deletions .github/workflows/release.yml

This file was deleted.

18 changes: 16 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ Push the tag.
When your repo is hosted by GitHub and you are using GitHub Actions, you should create a GitHub Release using the standard GitHub UI.
Having previously used `nbgv tag` and pushing the tag will help you identify the precise commit and name to use for this release.

After publishing the release, the `.github\workflows\release.yml` workflow will be automatically triggered, which will:
After publishing the release, the `.github/workflows/release.yml` workflow will be automatically triggered, which will:

1. Find the most recent `.github\workflows\build.yml` GitHub workflow run of the tagged release.
1. Find the most recent `.github/workflows/build.yml` GitHub workflow run of the tagged release.
1. Upload the `deployables` artifact from that workflow run to your GitHub Release.
1. If you have `NUGET_API_KEY` defined as a secret variable for your repo or org, any nuget packages in the `deployables` artifact will be pushed to nuget.org.

Expand All @@ -87,3 +87,17 @@ Configuration is in the `.github/renovate.json` file.
When changing the renovate.json file, follow [these validation steps](https://docs.renovatebot.com/config-validation/).

If Renovate is not creating pull requests when you expect it to, check that the [Renovate GitHub App](https://github.com/apps/renovate) is configured for your account or repo.

## Merging latest from Library.Template

### Maintaining your repo based on this template

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:
`
```ps1
git fetch
git checkout origin/main
./tools/MergeFrom-Template.ps1
# resolve any conflicts, then commit the merge commit.
git push origin -u HEAD
```
3 changes: 3 additions & 0 deletions CodeQL.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
path_classifiers:
library:
- 'test/**'
11 changes: 9 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\$(MSBuildProjectName)\</BaseOutputPath>
<PackageOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\NuGet\</PackageOutputPath>
<VSIXOutputPath>$(RepoRootPath)bin\Packages\$(Configuration)\Vsix\$(Platform)\</VSIXOutputPath>
<SBOMFileDestPath>$(VSIXOutputPath)</SBOMFileDestPath>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AnalysisLevel>latest</AnalysisLevel>
Expand All @@ -20,8 +21,7 @@
<EnableDynamicPlatformResolution>true</EnableDynamicPlatformResolution>

<!-- Opt in till https://github.com/NuGet/Home/issues/9803 makes this the default. -->
<!-- Opt back out until an SDK with the fix for https://github.com/NuGet/Home/issues/12177 is generally available. -->
<RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation>
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>

<!-- This entire repo has just one version.json file, so compute the version once and share with all projects in a large build. -->
<GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
Expand All @@ -40,6 +40,11 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<PropertyGroup>
<LangVersion Condition="'$(MSBuildProjectExtension)'=='.csproj'">13</LangVersion>
<LangVersion Condition="'$(MSBuildProjectExtension)'=='.vbproj'">16.9</LangVersion>
</PropertyGroup>

<ItemGroup>
<None Include="$(RepoRootPath)obj/NOTICE" Pack="true" PackagePath="" Visible="false" Condition=" Exists('$(RepoRootPath)obj/NOTICE') " />
</ItemGroup>
Expand All @@ -58,4 +63,6 @@
<PackageReleaseNotes Condition="'$(RepositoryUrl)'!=''">$(RepositoryUrl)/releases/tag/v$(Version)</PackageReleaseNotes>
</PropertyGroup>
</Target>

<Import Project="azure-pipelines\NuGetSbom.props" />
</Project>
6 changes: 0 additions & 6 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<LangVersion Condition="'$(Language)'=='C#'">13</LangVersion>
<LangVersion Condition="'$(Language)'=='VB'">16.9</LangVersion>
</PropertyGroup>
<ItemGroup>
<!-- Avoid compile error about missing namespace when combining ImplicitUsings with .NET Framework target frameworks. -->
<Using Remove="System.Net.Http" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
</ItemGroup>

<Import Project="azure-pipelines\NuGetSbom.targets" Condition="'$(IsPackable)'!='false'" />
</Project>
Loading
Loading