diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3a7b9b69..1b8c58ce 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "powershell": { - "version": "7.4.6", + "version": "7.5.0", "commands": [ "pwsh" ], diff --git a/.github/renovate.json b/.github/renovate.json index c140014f..55602947 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -16,6 +16,10 @@ "matchDatasources": ["dotnet-version", "docker"], "matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"], "groupName": "Dockerfile and global.json updates" + }, + { + "matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"], + "groupName": "microbuild" } ] } diff --git a/.github/workflows/docs_validate.yml b/.github/workflows/docs_validate.yml index 9be82c56..d1c8b8fb 100644 --- a/.github/workflows/docs_validate.yml +++ b/.github/workflows/docs_validate.yml @@ -6,12 +6,16 @@ on: jobs: build: - name: 📚 docfx + name: 📚 Doc validation runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: fetch-depth: 0 # avoid shallow clone so nbgv can do its work. + - name: 🔗 Markup Link Checker (mlc) + uses: becheran/mlc@v0.19.0 + with: + 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 - name: ⚙ Install prerequisites run: | ./init.ps1 -UpgradePrerequisites diff --git a/.github/workflows/libtemplate-update.yml b/.github/workflows/libtemplate-update.yml index c6b8fb4a..53df80ff 100644 --- a/.github/workflows/libtemplate-update.yml +++ b/.github/workflows/libtemplate-update.yml @@ -45,7 +45,7 @@ jobs: # Pushing commits that add or change files under .github/workflows will cause our workflow to fail. # But it usually isn't necessary because the target branch already has (or doesn't have) these changes. - # So if the merged doesn't bring in any changes to these files, try the merge locally and push that + # So if the merge doesn't bring in any changes to these files, try the merge locally and push that # to keep github happy. if ((git rev-list FETCH_HEAD ^HEAD --count -- .github/workflows) -eq 0) { # Indeed there are no changes in that area. So merge locally to try to appease GitHub. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 77f5e0a3..56dd666f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,7 +25,7 @@ You should install the version specified in `global.json` or a later version wit the same major.minor.Bxx "hundreds" band. For example if 2.2.300 is specified, you may install 2.2.300, 2.2.301, or 2.2.310 while the 2.2.400 version would not be considered compatible by .NET SDK. -See [.NET Core Versioning](https://docs.microsoft.com/dotnet/core/versions/) for more information. +See [.NET Core Versioning](https://learn.microsoft.com/dotnet/core/versions/) for more information. ## Package restore @@ -44,7 +44,7 @@ Building, testing, and packing this repository can be done by using the standard ## Releases Use `nbgv tag` to create a tag for a particular commit that you mean to release. -[Learn more about `nbgv` and its `tag` and `prepare-release` commands](https://github.com/dotnet/Nerdbank.GitVersioning/blob/main/doc/nbgv-cli.md). +[Learn more about `nbgv` and its `tag` and `prepare-release` commands](https://dotnet.github.io/Nerdbank.GitVersioning/docs/nbgv-cli.html). Push the tag. diff --git a/README.md b/README.md index f169179f..440dbd9a 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,6 @@ Adds a VS MEF system with a pre-computed, cached MEF graph. ## Microsoft.VisualStudio.Composition.VSMefx -[![NuGet package](https://img.shields.io/nuget/v/Microsoft.VisualStudio.Composition.VSMefx.svg)](https://nuget.org/packages/Microsoft.VisualStudio.Composition.VSMefx) - A diagnostic tool to understand catalogs, compositions and diagnose issues in them. [Learn more about this package](src/Microsoft.VisualStudio.Composition.VSMefx/README.md). diff --git a/azure-pipelines/unofficial.yml b/azure-pipelines/unofficial.yml index b00c39f7..92459599 100644 --- a/azure-pipelines/unofficial.yml +++ b/azure-pipelines/unofficial.yml @@ -75,7 +75,7 @@ extends: parameters: Is1ESPT: true RealSign: false - # ShouldSkipOptimize: ${{ parameters.ShouldSkipOptimize }} + ShouldSkipOptimize: ${{ parameters.ShouldSkipOptimize }} EnableAPIScan: ${{ parameters.EnableAPIScan }} windowsPool: VSEngSS-MicroBuild2022-1ES linuxPool: diff --git a/src/Microsoft.VisualStudio.Composition/Microsoft.VisualStudio.Composition.csproj b/src/Microsoft.VisualStudio.Composition/Microsoft.VisualStudio.Composition.csproj index 7793f0d6..1a8b831a 100644 --- a/src/Microsoft.VisualStudio.Composition/Microsoft.VisualStudio.Composition.csproj +++ b/src/Microsoft.VisualStudio.Composition/Microsoft.VisualStudio.Composition.csproj @@ -21,10 +21,6 @@ - - - - True diff --git a/tools/Get-NuGetTool.ps1 b/tools/Get-NuGetTool.ps1 index 3097c873..8a3b9eed 100644 --- a/tools/Get-NuGetTool.ps1 +++ b/tools/Get-NuGetTool.ps1 @@ -6,7 +6,7 @@ #> Param( [Parameter()] - [string]$NuGetVersion='6.4.0' + [string]$NuGetVersion='6.12.2' ) $toolsPath = & "$PSScriptRoot\Get-TempToolsPath.ps1"