Skip to content

Commit d2c0930

Browse files
JoeRobichJoeRobich
authored
Merge branch 'master' into renovate/typescript-5.x-lockfile
2 parents 3470d21 + 6c315c4 commit d2c0930

File tree

93 files changed

+424
-360
lines changed

Some content is hidden

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

93 files changed

+424
-360
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,14 @@
88
"dotnet-outdated"
99
]
1010
},
11-
"gitversion.tool": {
12-
"version": "6.1.0",
13-
"commands": [
14-
"dotnet-gitversion"
15-
]
16-
},
1711
"dotnet-reportgenerator-globaltool": {
1812
"version": "5.4.3",
1913
"commands": [
2014
"reportgenerator"
2115
]
2216
},
2317
"nuke.globaltool": {
24-
"version": "8.1.4",
18+
"version": "9.0.4",
2519
"commands": [
2620
"nuke"
2721
]
@@ -38,12 +32,6 @@
3832
"jb"
3933
]
4034
},
41-
"dotnet-format": {
42-
"version": "5.1.250801",
43-
"commands": [
44-
"dotnet-format"
45-
]
46-
},
4735
"nukeeper": {
4836
"version": "0.35.0",
4937
"commands": [

‎.github/workflows/ci.yml

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,27 +83,26 @@ jobs:
8383
with:
8484
clean: 'false'
8585
fetch-depth: '0'
86-
- name: NuGet Cache
87-
uses: actions/cache@v4
86+
- name: Restore NuGet Cache
87+
id: restore-nuget-cache
88+
uses: actions/cache/restore@v4
8889
with:
8990
path: '${{ github.workspace }}/.nuget/packages'
90-
key: "${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}-${{ hashFiles('**/Directory.Packages.support.props') }}"
91-
restore-keys: |
92-
${{ runner.os }}-nuget-
91+
key: "${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}-${{ hashFiles('**/dotnet-tools.json') }}"
9392
- name: 🔨 Use .NET Core 3.1 SDK
94-
uses: actions/setup-dotnet@v4.2.0
93+
uses: actions/setup-dotnet@v4.3.0
9594
with:
9695
dotnet-version: '3.1.x'
9796
- name: 🔨 Use .NET Core 6.0 SDK
98-
uses: actions/setup-dotnet@v4.2.0
97+
uses: actions/setup-dotnet@v4.3.0
9998
with:
10099
dotnet-version: '6.0.x'
101100
- name: 🔨 Use .NET Core 8.0 SDK
102-
uses: actions/setup-dotnet@v4.2.0
101+
uses: actions/setup-dotnet@v4.3.0
103102
with:
104103
dotnet-version: '8.0.x'
105104
- name: 🔨 Use .NET Core 9.0 SDK
106-
uses: actions/setup-dotnet@v4.2.0
105+
uses: actions/setup-dotnet@v4.3.0
107106
with:
108107
dotnet-version: '9.0.x'
109108
- name: 🎁 dotnet tool restore
@@ -113,6 +112,12 @@ jobs:
113112
id: restore
114113
run: |
115114
dotnet nuke Restore --skip
115+
- name: Update NuGet Cache
116+
if: always() && steps.restore-nuget-cache.outputs.cache-hit != 'true'
117+
uses: actions/cache/save@v4
118+
with:
119+
key: "${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}-${{ hashFiles('**/dotnet-tools.json') }}"
120+
path: '${{ github.workspace }}/.nuget/packages'
116121
- name: ⚙ Build
117122
id: build
118123
run: |
@@ -136,9 +141,9 @@ jobs:
136141
working-directory: 'vscode-testextension'
137142
- name: 🏺 Publish coverage data
138143
if: always()
139-
uses: actions/upload-artifact@v3
144+
uses: actions/upload-artifact@v4
140145
with:
141-
name: 'coverage'
146+
name: 'coverage-${{ matrix.os }}'
142147
path: 'coverage/'
143148
- name: 🐿 Publish Coverage
144149
if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || ((github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'dependabot[bot]')
@@ -147,31 +152,39 @@ jobs:
147152
name: 'actions-${{ matrix.os }}'
148153
- name: 🏺 Publish logs
149154
if: always()
150-
uses: actions/upload-artifact@v3
155+
uses: actions/upload-artifact@v4
151156
with:
152-
name: 'logs'
157+
name: 'logs-${{ matrix.os }}'
153158
path: 'artifacts/logs/'
154159
- name: 🏺 Publish test data
155160
if: always()
156-
uses: actions/upload-artifact@v3
161+
uses: actions/upload-artifact@v4
157162
with:
158-
name: 'test data'
163+
name: 'test data-${{ matrix.os }}'
159164
path: 'artifacts/test/'
160165
- name: 🏺 Publish NuGet Packages
161166
if: always()
162-
uses: actions/upload-artifact@v3
167+
uses: actions/upload-artifact@v4
163168
with:
164-
name: 'nuget'
169+
name: 'nuget-${{ matrix.os }}'
165170
path: 'artifacts/nuget/'
166171
- name: 🏺 Publish Documentation
167-
uses: actions/upload-artifact@v3
172+
uses: actions/upload-artifact@v4
168173
with:
169-
name: 'docs'
174+
name: 'docs-${{ matrix.os }}'
170175
path: 'artifacts/docs/'
176+
Merge:
177+
runs-on: ubuntu-latest
178+
needs: build
179+
steps:
180+
- name: Merge Artifacts
181+
uses: actions/upload-artifact/merge@v4
182+
with:
183+
name: nuget
184+
pattern: nuget-*
171185
Publish:
172-
needs:
173-
- Build
174-
uses: RocketSurgeonsGuild/actions/.github/workflows/[email protected]
186+
needs: Merge
187+
uses: RocketSurgeonsGuild/actions/.github/workflows/[email protected]
175188
secrets:
176189
RSG_NUGET_API_KEY: '${{ secrets.RSG_NUGET_API_KEY }}'
177190
RSG_AZURE_DEVOPS: '${{ secrets.RSG_AZURE_DEVOPS }}'

‎.github/workflows/close-milestone.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ jobs:
1919
- name: Install GitVersion
2020
uses: gittools/actions/gitversion/[email protected]
2121
with:
22-
versionSpec: '5.x'
22+
versionSpec: '6.0.x'
23+
preferLatestVersion: true
2324

2425
- name: Install GitReleaseManager
2526
uses: gittools/actions/gitreleasemanager/[email protected]
2627
with:
27-
versionSpec: '0.15.x'
28+
versionSpec: '0.18.x'
2829

2930
- name: Use GitVersion
3031
id: gitversion
@@ -41,7 +42,7 @@ jobs:
4142

4243
# move any issues to that milestone in the event the release is renamed
4344
- name: sync milestones
44-
uses: RocketSurgeonsGuild/actions/[email protected].3
45+
uses: RocketSurgeonsGuild/actions/[email protected].15
4546
with:
4647
default-label: 'mysterious'
4748
github-token: ${{ secrets.OMNISHARP_BOT_TOKEN }}

‎.github/workflows/draft-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ jobs:
2929
- name: Install GitVersion
3030
uses: gittools/actions/gitversion/[email protected]
3131
with:
32-
versionSpec: '5.x'
32+
versionSpec: '6.0.x'
33+
preferLatestVersion: true
3334

3435
- name: Use GitVersion
3536
id: gitversion
@@ -44,7 +45,7 @@ jobs:
4445
continue-on-error: true
4546

4647
- name: sync milestones
47-
uses: RocketSurgeonsGuild/actions/[email protected].3
48+
uses: RocketSurgeonsGuild/actions/[email protected].15
4849
with:
4950
default-label: 'mysterious'
5051
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/publish-nuget.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ jobs:
2121

2222
- uses: nuget/setup-nuget@v2
2323
with:
24-
nuget-version: '5.x'
24+
nuget-version: '6.x'
2525

26-
- uses: actions/download-artifact@v3
26+
- uses: actions/download-artifact@v4
2727
with:
28-
name: nuget
28+
path: nuget
29+
pattern: nuget-*
30+
merge-multiple: true
2931

3032
- name: nuget.org
3133
# continue-on-error: true

‎.github/workflows/sync-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- name: Run Labeler
2222
if: success()
23-
uses: crazy-max/ghaction-github-labeler@v5.1.0
23+
uses: crazy-max/ghaction-github-labeler@v5.2.0
2424
with:
2525
yaml-file: .github/labels.yml
2626
skip-delete: false

‎.github/workflows/update-milestone.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ jobs:
2727
if: ${{ github.event.action == 'opened' }}
2828
uses: gittools/actions/gitversion/[email protected]
2929
with:
30-
versionSpec: '5.x'
30+
versionSpec: '6.0.x'
31+
preferLatestVersion: true
3132

3233
- name: Install GitReleaseManager
3334
if: ${{ github.event.action == 'opened' }}
3435
uses: gittools/actions/gitreleasemanager/[email protected]
3536
with:
36-
versionSpec: '0.15.x'
37+
versionSpec: '0.18.x'
3738

3839
- name: Use GitVersion
3940
if: ${{ github.event.action == 'opened' }}
@@ -50,7 +51,7 @@ jobs:
5051
continue-on-error: true
5152

5253
- name: sync milestones
53-
uses: RocketSurgeonsGuild/actions/[email protected].3
54+
uses: RocketSurgeonsGuild/actions/[email protected].15
5455
with:
5556
default-label: 'mysterious'
5657
github-token: ${{ secrets.GITHUB_TOKEN }}

‎Directory.Packages.props

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
8-
<PackageVersion Include="Rocket.Surgery.MSBuild.CI" Version="1.1.5" />
9-
<PackageVersion Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.1.5" />
8+
<PackageVersion Include="Rocket.Surgery.MSBuild.CI" Version="1.2.1" />
9+
<PackageVersion Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.2.1" />
1010
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
1111
</ItemGroup>
1212
<!-- Samples -->
@@ -24,42 +24,42 @@
2424
<PackageVersion Include="GitVersion.Tool" Version="6.1.0" />
2525
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2024.3.4" />
2626
<PackageVersion Include="ReportGenerator" Version="5.4.3" />
27-
<PackageVersion Include="Rocket.Surgery.Nuke" Version="1.7.4" />
27+
<PackageVersion Include="Rocket.Surgery.Nuke" Version="1.8.36" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<!-- backwards compat is maintained in Directory.Packages.supports.props -->
31-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
32-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
33-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
34-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
35-
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
36-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
37-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
31+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
32+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
34+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
35+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.1" />
36+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.1" />
37+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
3838
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
3939
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
4040
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
4141
<PackageVersion Include="xunit" Version="2.9.3" />
42-
<PackageVersion Include="FluentAssertions" Version="7.1.0" />
42+
<PackageVersion Include="FluentAssertions" Version="8.0.1" />
4343
<PackageVersion Include="Verify.Xunit" Version="28.0.0" />
4444
<PackageVersion Include="Verify.SourceGenerators" Version="2.4.3" />
4545
<PackageVersion Include="NSubstitute" Version="5.3.0" />
46-
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
46+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
4747
<PackageVersion Include="Serilog.Sinks.Observable" Version="3.0.0" />
4848
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.19" />
49-
<PackageVersion Include="XunitXml.TestLogger" Version="4.0.254" />
49+
<PackageVersion Include="XunitXml.TestLogger" Version="5.0.0" />
5050
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
5151
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
5252
<PackageVersion Include="System.Reactive" Version="6.0.1" />
53-
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
54-
<PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
53+
<PackageVersion Include="System.Collections.Immutable" Version="9.0.1" />
54+
<PackageVersion Include="System.Threading.Channels" Version="9.0.1" />
5555
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.1" />
56-
<PackageVersion Include="MediatR" Version="9.0.0" />
56+
<PackageVersion Include="MediatR" Version="12.4.1" />
5757
<PackageVersion Include="Bogus" Version="35.6.1" />
5858
<PackageVersion Include="Snapper" Version="2.4.1" />
59-
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
59+
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
6060
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
6161
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
62-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
62+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
6363
<PackageVersion Include="DryIoc.Internal" Version="5.4.3" />
6464
</ItemGroup>
6565
</Project>

‎GitVersion.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
assembly-versioning-scheme: MajorMinorPatch
2-
mode: ContinuousDeployment
1+
workflow: GitHubFlow/v1
2+
semantic-version-format: Loose
3+
34
branches:
4-
master:
5-
tag: alpha
5+
main:
6+
mode: ContinuousDeployment
7+
label: alpha

0 commit comments

Comments
 (0)