Skip to content

Commit

Permalink
Merge pull request #1382 from microsoft/dev/andarno/libtemplateUpdate
Browse files Browse the repository at this point in the history
Merge latest Library.Template
  • Loading branch information
AArnott authored Mar 7, 2025
2 parents f278cef + 16c8019 commit c61a17a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"rollForward": false
},
"dotnet-coverage": {
"version": "17.14.1",
"version": "17.14.2",
"commands": [
"dotnet-coverage"
],
Expand Down
51 changes: 4 additions & 47 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,10 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"],
"semanticCommits": "disabled",
"labels": ["dependencies"],
"extends": [
"github>microsoft/vs-renovate-presets:microbuild",
"github>microsoft/vs-renovate-presets:vs_main_dependencies"
],
"packageRules": [
{
"matchPackageNames": ["nbgv", "nerdbank.gitversioning"],
"groupName": "nbgv and nerdbank.gitversioning updates"
},
{
"matchPackageNames": ["xunit*"],
"groupName": "xunit"
},
{
"matchDatasources": ["dotnet-version", "docker"],
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
"groupName": "Dockerfile and global.json updates"
},
{
"matchPackageNames": ["*"],
"allowedVersions": "!/-g[a-f0-9]+$/"
},
{
"matchPackageNames": [
"System.Collections.Immutable",
"System.Composition*",
"System.Diagnostics.DiagnosticSource",
"System.IO.Pipelines",
"System.Reflection.Metadata",
"System.Text.Json",
"System.Threading.Tasks.Dataflow",
"Microsoft.Bcl.AsyncInterfaces"
],
"allowedVersions": "<9.0",
"groupName": "Included in .NET runtime"
},
{
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
"groupName": "microbuild"
},
{
"matchPackageNames": ["Microsoft.VisualStudio.*"],
"groupName": "Visual Studio SDK"
},
{
"matchPackageNames": ["Microsoft.VisualStudio.*"],
"matchUpdateTypes": ["patch"],
"enabled": false
},
{
"matchPackageNames": ["MessagePack", "MessagePackAnalyzer"],
"enabled": false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ jobs:

- name: 💽 Upload artifacts to release
shell: pwsh
if: ${{ github.event.release.assets_url }} != ''
if: ${{ github.event_name == 'release' && github.event.release.assets_url != '' }}
env:
GH_TOKEN: ${{ github.token }}
run: |
Get-ChildItem '${{ runner.temp }}/deployables' |% {
Get-ChildItem '${{ runner.temp }}/deployables' -File -Recurse |% {
Write-Host "Uploading $($_.Name) to release..."
gh release -R ${{ github.repository }} upload "${{ github.ref_name }}" $_.FullName
}
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ extends:
codeSignValidation:
enabled: true
break: true
additionalTargetsGlobPattern: -|Variables-*\*.ps1;-|APIScanInputs-*\**;-|test_symbols-*\**;-|MicroBuild\**
additionalTargetsGlobPattern: -|Variables-*\*.ps1;-|LocBin-*\**;-|APIScanInputs-*\**;-|test_symbols-*\**;-|MicroBuild\**
policheck:
enabled: true
exclusionsFile: $(System.DefaultWorkingDirectory)\azure-pipelines\PoliCheckExclusions.xml
Expand Down
7 changes: 7 additions & 0 deletions azure-pipelines/vs-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
trigger: none # We only want to trigger manually or based on resources
pr: none

# parameters:
# - name: ShouldSkipOptimize # Uncomment this and references to it below when setting EnableOptProf to true in build.yml.
# displayName: Skip OptProf optimization
# type: boolean
# default: false

resources:
repositories:
- repository: MicroBuildTemplate
Expand Down Expand Up @@ -36,6 +42,7 @@ extends:
parameters:
Is1ESPT: true
RealSign: false
# ShouldSkipOptimize: ${{ parameters.ShouldSkipOptimize }}
windowsPool: VSEngSS-MicroBuild2022-1ES
linuxPool:
name: AzurePipelines-EO
Expand Down

0 comments on commit c61a17a

Please sign in to comment.