Skip to content

Commit 95b0fe1

Browse files
AArnottAArnott
committed
Merge branch 'dotnetLTSlimitation' into renovate/dotnet-monorepo
2 parents 32d3f70 + a329741 commit 95b0fe1

File tree

48 files changed

+192
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+192
-262
lines changed

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"rollForward": false
1111
},
1212
"dotnet-coverage": {
13-
"version": "17.13.1",
13+
"version": "17.14.2",
1414
"commands": [
1515
"dotnet-coverage"
1616
],
@@ -24,7 +24,7 @@
2424
"rollForward": false
2525
},
2626
"docfx": {
27-
"version": "2.78.2",
27+
"version": "2.78.3",
2828
"commands": [
2929
"docfx"
3030
],

‎.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.102-noble
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.201-noble
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/renovate.json

Lines changed: 13 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,27 @@
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+
"github>microsoft/vs-renovate-presets:dotnet_packages_LTS",
7+
"github>microsoft/vs-renovate-presets:xunitv2"
8+
],
69
"packageRules": [
710
{
8-
"matchPackageNames": ["nbgv", "nerdbank.gitversioning"],
9-
"groupName": "nbgv and nerdbank.gitversioning updates"
10-
},
11-
{
12-
"matchPackageNames": ["xunit*"],
13-
"groupName": "xunit"
14-
},
15-
{
16-
"matchPackageNames": ["xunit.runner.visualstudio"],
17-
"allowedVersions": "<3.0"
18-
},
19-
{
20-
"matchPackageNames": ["xunit.combinatorial"],
21-
"allowedVersions": "<2.0"
22-
},
23-
{
24-
"matchDatasources": ["dotnet-version", "docker"],
25-
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
26-
"groupName": "Dockerfile and global.json updates"
27-
},
28-
{
29-
"matchPackageNames": ["*"],
30-
"allowedVersions": "!/-g[a-f0-9]+$/"
31-
},
32-
{
33-
"matchPackageNames": [
34-
"System.Collections.Immutable",
35-
"System.Composition*",
36-
"System.Diagnostics.DiagnosticSource",
37-
"System.IO.Pipelines",
38-
"System.Reflection.Metadata",
39-
"System.Text.Json",
40-
"System.Threading.Tasks.Dataflow",
41-
"Microsoft.Bcl.AsyncInterfaces"
42-
],
43-
"allowedVersions": "<9.0",
44-
"groupName": "Included in .NET runtime"
45-
},
46-
{
47-
"matchPackageNames": ["Microsoft.VisualStudio.Internal.MicroBuild*"],
48-
"groupName": "microbuild"
49-
},
50-
{
51-
"matchPackageNames": ["Microsoft.VisualStudio.*"],
52-
"groupName": "Visual Studio SDK"
53-
},
54-
{
55-
"matchPackageNames": ["Microsoft.VisualStudio.*"],
56-
"matchUpdateTypes": ["patch"],
57-
"enabled": false
58-
},
59-
{
60-
"matchJsonata": [ "sharedVariableName='CodeAnalysisVersion'" ],
11+
"matchJsonata": ["sharedVariableName='CodeAnalysisVersion'"],
6112
"enabled": false
6213
}
6314
],
6415
"customManagers": [
6516
{
6617
"customType": "regex",
6718
"datasourceTemplate": "nuget",
68-
"fileMatch": ["test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Helpers/ReferencesHelper.cs"],
69-
"matchStrings": ["PackageIdentity\\(\"(?<packageName>[^\"]+)\", \"(?<currentValue>[^\"]+)\"\\)"]
19+
"fileMatch": [
20+
"test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Helpers/ReferencesHelper.cs"
21+
],
22+
"matchStrings": [
23+
"PackageIdentity\\(\"(?<packageName>[^\"]+)\", \"(?<currentValue>[^\"]+)\"\\)"
24+
]
7025
}
7126
]
7227
}

‎.github/workflows/release.yml

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎Directory.Packages.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@
6262
<GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" />
6363
<GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
6464
<GlobalPackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" />
65-
<!-- The condition works around https://github.com/dotnet/sdk/issues/44951 -->
66-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
65+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
6766
<GlobalPackageReference Include="PolySharp" Version="1.15.0" />
6867
<GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
6968
</ItemGroup>

‎Microsoft.VisualStudio.Threading.sln

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C1DAF484-7
5151
test\Directory.Build.targets = test\Directory.Build.targets
5252
EndProjectSection
5353
EndProject
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.Threading.JointPackage", "src\Microsoft.VisualStudio.Threading.JointPackage\Microsoft.VisualStudio.Threading.JointPackage.csproj", "{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}"
55+
EndProject
5456
Global
5557
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5658
Debug|Any CPU = Debug|Any CPU
@@ -137,6 +139,14 @@ Global
137139
{8CDF7526-D625-4E16-A266-BAF654ABE181}.Release|Any CPU.Build.0 = Release|Any CPU
138140
{8CDF7526-D625-4E16-A266-BAF654ABE181}.Release|NonWindows.ActiveCfg = Release|Any CPU
139141
{8CDF7526-D625-4E16-A266-BAF654ABE181}.Release|NonWindows.Build.0 = Release|Any CPU
142+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
144+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}.Debug|NonWindows.ActiveCfg = Debug|Any CPU
145+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}.Debug|NonWindows.Build.0 = Debug|Any CPU
146+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}.Release|Any CPU.Build.0 = Release|Any CPU
148+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}.Release|NonWindows.ActiveCfg = Release|Any CPU
149+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB}.Release|NonWindows.Build.0 = Release|Any CPU
140150
EndGlobalSection
141151
GlobalSection(SolutionProperties) = preSolution
142152
HideSolutionNode = FALSE
@@ -152,6 +162,7 @@ Global
152162
{7177DEEE-D14D-4A4A-BF6E-8B0CDC26B624} = {96134B19-FB32-4FA0-A565-BD4247D1E5B2}
153163
{D5A0D627-7853-43F5-9AF4-E23D062C6ABA} = {96134B19-FB32-4FA0-A565-BD4247D1E5B2}
154164
{8CDF7526-D625-4E16-A266-BAF654ABE181} = {96134B19-FB32-4FA0-A565-BD4247D1E5B2}
165+
{D149A8B3-A98F-4EDD-8C12-5CCDCBFB68DB} = {96134B19-FB32-4FA0-A565-BD4247D1E5B2}
155166
EndGlobalSection
156167
GlobalSection(ExtensibilityGlobals) = postSolution
157168
SolutionGuid = {E2124DFF-970E-4BA1-9E50-3ADB0AABF347}

‎azure-pipelines/build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ parameters:
7171
type: boolean
7272
default: true
7373

74+
- name: PublishCodeCoverage
75+
type: boolean
76+
default: true
77+
7478
# Whether this is a special one-off build for inserting into VS for a validation insertion PR (that will never be merged).
7579
- name: SkipCodesignVerify
7680
type: boolean
@@ -194,7 +198,7 @@ jobs:
194198
IsOptProf: ${{ parameters.IsOptProf }}
195199

196200
- ${{ if and(parameters.EnableDotNetFormatCheck, not(parameters.EnableLinuxBuild)) }}:
197-
- script: dotnet format --verify-no-changes
201+
- script: dotnet format --verify-no-changes --no-restore
198202
displayName: 💅 Verify formatted code
199203
env:
200204
dotnetformat: true # part of a workaround for https://github.com/dotnet/sdk/issues/44951
@@ -236,7 +240,7 @@ jobs:
236240
Is1ESPT: ${{ parameters.Is1ESPT }}
237241
RunTests: ${{ parameters.RunTests }}
238242
- ${{ if parameters.EnableDotNetFormatCheck }}:
239-
- script: dotnet format --verify-no-changes
243+
- script: dotnet format --verify-no-changes --no-restore
240244
displayName: 💅 Verify formatted code
241245
env:
242246
dotnetformat: true # part of a workaround for https://github.com/dotnet/sdk/issues/44951
@@ -299,7 +303,7 @@ jobs:
299303
parameters:
300304
EnableLinuxBuild: ${{ parameters.EnableLinuxBuild }}
301305
EnableMacOSBuild: ${{ parameters.EnableMacOSBuild }}
302-
- ${{ if parameters.RunTests }}:
306+
- ${{ if and(parameters.RunTests, parameters.PublishCodeCoverage) }}:
303307
- template: publish-codecoverage.yml
304308
parameters:
305309
EnableLinuxBuild: ${{ parameters.EnableLinuxBuild }}

‎azure-pipelines/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88

99
steps:
1010

11-
- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) -warnAsError -warnNotAsError:NU1901,NU1902,NU1903,NU1904 /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
11+
- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) -warnAsError -warnNotAsError:NU1901,NU1902,NU1903,NU1904,LOCTASK002 /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
1212
displayName: 🛠 dotnet build
1313

1414
- ${{ if not(parameters.IsOptProf) }}:

‎azure-pipelines/official.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ parameters:
2626
- name: EnableAPIScan
2727
displayName: Include APIScan with compliance tools
2828
type: boolean
29-
default: true # enable in individual repos only AFTER updating TSAOptions.json with your own values
29+
default: true
30+
- name: PublishCodeCoverage
31+
displayName: Publish code coverage
32+
type: boolean
33+
default: true
3034

3135
resources:
3236
repositories:
@@ -46,14 +50,14 @@ extends:
4650
codeSignValidation:
4751
enabled: true
4852
break: true
49-
additionalTargetsGlobPattern: -|Variables-*\*.ps1;-|APIScanInputs-*\**;-|test_symbols-*\**;-|MicroBuild\**
53+
additionalTargetsGlobPattern: -|Variables-*\*.ps1;-|LocBin-*\**;-|APIScanInputs-*\**;-|test_symbols-*\**;-|MicroBuild\**
5054
policheck:
5155
enabled: true
5256
exclusionsFile: $(System.DefaultWorkingDirectory)\azure-pipelines\PoliCheckExclusions.xml
5357
suppression:
5458
suppressionFile: $(System.DefaultWorkingDirectory)\azure-pipelines\falsepositives.gdnsuppress
5559
sbom:
56-
enabled: true
60+
enabled: false # Skip 1ES SBOM because microbuild has our own sbom system
5761
stages:
5862
- stage: Build
5963
variables:
@@ -77,6 +81,7 @@ extends:
7781
os: macOS
7882
EnableMacOSBuild: ${{ parameters.EnableMacOSBuild }}
7983
RunTests: ${{ parameters.RunTests }}
84+
PublishCodeCoverage: ${{ parameters.PublishCodeCoverage }}
8085
- template: /azure-pipelines/prepare-insertion-stages.yml@self
8186
parameters:
8287
RealSign: true

‎azure-pipelines/unofficial.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ parameters:
3838
displayName: Enable Production SDL
3939
type: boolean
4040
default: false
41+
- name: PublishCodeCoverage
42+
displayName: Publish code coverage
43+
type: boolean
44+
default: true
4145

4246
resources:
4347
repositories:
@@ -66,7 +70,7 @@ extends:
6670
enabled: ${{ parameters.EnableProductionSDL }}
6771
exclusionsFile: $(System.DefaultWorkingDirectory)\azure-pipelines\PoliCheckExclusions.xml
6872
sbom:
69-
enabled: ${{ parameters.EnableProductionSDL }}
73+
enabled: false # Skip 1ES SBOM because microbuild has our own sbom system
7074
stages:
7175
- stage: Build
7276
variables:
@@ -90,3 +94,4 @@ extends:
9094
os: macOS
9195
EnableMacOSBuild: ${{ parameters.EnableMacOSBuild }}
9296
RunTests: ${{ parameters.RunTests }}
97+
PublishCodeCoverage: ${{ parameters.PublishCodeCoverage }}

0 commit comments

Comments
 (0)