Skip to content

Commit c61a17a

Browse files
authored
Merge pull request #1382 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents f278cef + 16c8019 commit c61a17a

File tree

5 files changed

+15
-51
lines changed

5 files changed

+15
-51
lines changed

.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"rollForward": false
1111
},
1212
"dotnet-coverage": {
13-
"version": "17.14.1",
13+
"version": "17.14.2",
1414
"commands": [
1515
"dotnet-coverage"
1616
],

.github/renovate.json

+4-47
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,10 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["config:recommended"],
4-
"semanticCommits": "disabled",
5-
"labels": ["dependencies"],
3+
"extends": [
4+
"github>microsoft/vs-renovate-presets:microbuild",
5+
"github>microsoft/vs-renovate-presets:vs_main_dependencies"
6+
],
67
"packageRules": [
7-
{
8-
"matchPackageNames": ["nbgv", "nerdbank.gitversioning"],
9-
"groupName": "nbgv and nerdbank.gitversioning updates"
10-
},
11-
{
12-
"matchPackageNames": ["xunit*"],
13-
"groupName": "xunit"
14-
},
15-
{
16-
"matchDatasources": ["dotnet-version", "docker"],
17-
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
18-
"groupName": "Dockerfile and global.json updates"
19-
},
20-
{
21-
"matchPackageNames": ["*"],
22-
"allowedVersions": "!/-g[a-f0-9]+$/"
23-
},
24-
{
25-
"matchPackageNames": [
26-
"System.Collections.Immutable",
27-
"System.Composition*",
28-
"System.Diagnostics.DiagnosticSource",
29-
"System.IO.Pipelines",
30-
"System.Reflection.Metadata",
31-
"System.Text.Json",
32-
"System.Threading.Tasks.Dataflow",
33-
"Microsoft.Bcl.AsyncInterfaces"
34-
],
35-
"allowedVersions": "<9.0",
36-
"groupName": "Included in .NET runtime"
37-
},
38-
{
39-
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
40-
"groupName": "microbuild"
41-
},
42-
{
43-
"matchPackageNames": ["Microsoft.VisualStudio.*"],
44-
"groupName": "Visual Studio SDK"
45-
},
46-
{
47-
"matchPackageNames": ["Microsoft.VisualStudio.*"],
48-
"matchUpdateTypes": ["patch"],
49-
"enabled": false
50-
},
518
{
529
"matchPackageNames": ["MessagePack", "MessagePackAnalyzer"],
5310
"enabled": false

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ jobs:
7474

7575
- name: 💽 Upload artifacts to release
7676
shell: pwsh
77-
if: ${{ github.event.release.assets_url }} != ''
77+
if: ${{ github.event_name == 'release' && github.event.release.assets_url != '' }}
7878
env:
7979
GH_TOKEN: ${{ github.token }}
8080
run: |
81-
Get-ChildItem '${{ runner.temp }}/deployables' |% {
81+
Get-ChildItem '${{ runner.temp }}/deployables' -File -Recurse |% {
8282
Write-Host "Uploading $($_.Name) to release..."
8383
gh release -R ${{ github.repository }} upload "${{ github.ref_name }}" $_.FullName
8484
}

azure-pipelines/official.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extends:
4646
codeSignValidation:
4747
enabled: true
4848
break: true
49-
additionalTargetsGlobPattern: -|Variables-*\*.ps1;-|APIScanInputs-*\**;-|test_symbols-*\**;-|MicroBuild\**
49+
additionalTargetsGlobPattern: -|Variables-*\*.ps1;-|LocBin-*\**;-|APIScanInputs-*\**;-|test_symbols-*\**;-|MicroBuild\**
5050
policheck:
5151
enabled: true
5252
exclusionsFile: $(System.DefaultWorkingDirectory)\azure-pipelines\PoliCheckExclusions.xml

azure-pipelines/vs-validation.yml

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
trigger: none # We only want to trigger manually or based on resources
66
pr: none
77

8+
# parameters:
9+
# - name: ShouldSkipOptimize # Uncomment this and references to it below when setting EnableOptProf to true in build.yml.
10+
# displayName: Skip OptProf optimization
11+
# type: boolean
12+
# default: false
13+
814
resources:
915
repositories:
1016
- repository: MicroBuildTemplate
@@ -36,6 +42,7 @@ extends:
3642
parameters:
3743
Is1ESPT: true
3844
RealSign: false
45+
# ShouldSkipOptimize: ${{ parameters.ShouldSkipOptimize }}
3946
windowsPool: VSEngSS-MicroBuild2022-1ES
4047
linuxPool:
4148
name: AzurePipelines-EO

0 commit comments

Comments
 (0)