Skip to content

Commit 2a865be

Browse files
jjonesczjjonescz
authored
Update SourceBrowser (#184)
* Update SourceBrowser * Use .NET from global.json in CI
1 parent d961464 commit 2a865be

File tree

26 files changed

+182
-68
lines changed

26 files changed

+182
-68
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
build:
1111
runs-on: windows-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v1
15+
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: '8.0.x'
17+
global-json-file: global.json
1818
- name: Restore source-indexer.sln
1919
run: dotnet restore src/source-indexer.sln
2020
- name: Build source-indexer.sln

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.404",
3+
"version": "9.0.203",
44
"rollForward": "major"
55
}
66
}

‎src/SourceBrowser.hash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2b57a3d551d02c05b90d006f48cfa07c0a7e5cd2
1+
bf64cd8ac09f60e605e1a86784da47cc2c034a89

‎src/SourceBrowser/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ bld/
2525
# Visual Studo 2015 cache/options directory
2626
.vs/
2727

28+
# Rider
29+
.idea/
30+
2831
# MSTest test Results
2932
[Tt]est[Rr]esult*/
3033
[Bb]uild[Ll]og.*

‎src/SourceBrowser/TestCode/Project2/Class1.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,18 @@ static TargetedTypeNewTest Create()
169169
{
170170
return new(new());
171171
}
172-
}
172+
}
173+
174+
class TypeWithPrimaryConstructor(A a, B b)
175+
{
176+
public A A => a;
177+
public B[] ArrayOfB => [b];
178+
}
179+
180+
class EmptyType;
181+
182+
class TypeWithAllowsRefStruct<T>
183+
where T : allows ref struct
184+
{
185+
public static T Return(T value) => value;
186+
}

‎src/SourceBrowser/src/BinLogParser/BinLogParser.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net9.0</TargetFrameworks>
55
<AssemblyName>BinLogParser</AssemblyName>
66
<RootNamespace>Microsoft.SourceBrowser.BinLogParser</RootNamespace>
77
</PropertyGroup>

‎src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<PackAsTool>true</PackAsTool>
77
<RollForward>Major</RollForward>
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

‎src/SourceBrowser/src/Common/Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>Microsoft.SourceBrowser.Common</AssemblyName>
4-
<TargetFrameworks>net472;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net9.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\..\key.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>

‎src/SourceBrowser/src/Common/PriorityQueue.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
using System.Collections.Generic;
22
using System.Diagnostics;
33

4+
// WARNING: this class has a bug!
5+
// See here for an explanation:
6+
// https://github.com/dotnet/wpf/blob/bcd972664606974adc09f7f1b8c7a9a14c33c899/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/LegacyPriorityQueue.cs#L21
7+
// I don't care enough to switch to the new implementation, but it's important to leave this notice here.
8+
// We copied the old code before the fix was made in the WPF sources.
9+
410
namespace Microsoft.SourceBrowser.Common
511
{
612
/// <summary>
@@ -207,4 +213,4 @@ public void PushRange(IEnumerable<T> list)
207213
}
208214
}
209215
}
210-
}
216+
}

‎src/SourceBrowser/src/Directory.Packages.props‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77

88
<ItemGroup>
99
<!-- msbuild-->
10-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.5.0" />
11-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.5.0" />
12-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.5.0" />
13-
<PackageVersion Include="Microsoft.Build" Version="17.5.0" />
10+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.12.6" />
11+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.12.6" />
12+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
13+
<PackageVersion Include="Microsoft.Build" Version="17.12.6" />
1414

1515
<!-- component governance -->
1616
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
1717

1818
<!-- roslyn -->
19-
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.2.0" />
20-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
21-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
22-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.2.0" />
23-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.2.0" />
24-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.2.0" />
25-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.2.0" />
26-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.2.0" />
27-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.2.0" />
28-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.2.0" />
19+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.12.0" />
20+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
21+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0" />
23+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
24+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.12.0" />
25+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.12.0" />
26+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.12.0" />
27+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
28+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0" />
2929

3030
<!-- roslyn analyzer -->
3131
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
@@ -40,30 +40,30 @@
4040
<PackageVersion Include="NUnit3TestAdapter" Version="3.15.1" />
4141
<PackageVersion Include="xunit" Version="2.4.1" />
4242
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
43-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
43+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
4444
<PackageVersion Include="Shouldly" Version="4.0.3" />
4545

4646
<!-- other dependencies -->
4747
<PackageVersion Include="LibGit2Sharp" Version="0.29.0" />
4848
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.169" />
4949
<PackageVersion Include="ManagedEsent" Version="1.9.4" />
5050
<PackageVersion Include="System.Reactive" Version="5.0.0" />
51-
<PackageVersion Include="System.Composition" Version="6.0.0" />
52-
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
51+
<PackageVersion Include="System.Composition" Version="8.0.0" />
52+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
5353

54-
<PackageVersion Include="System.Buffers" Version="4.5.1" />
55-
<PackageVersion Include="System.Memory" Version="4.5.5" />
56-
<PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
54+
<PackageVersion Include="System.Buffers" Version="4.6.0" />
55+
<PackageVersion Include="System.Memory" Version="4.6.0" />
56+
<PackageVersion Include="System.Numerics.Vectors" Version="4.6.0" />
5757
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
5858
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
5959

60-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.5.3" />
61-
<PackageVersion Include="Microsoft.NET.StringTools" Version="17.5.0" />
60+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
61+
<PackageVersion Include="Microsoft.NET.StringTools" Version="17.12.6" />
6262
<PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="16.10.230" />
63-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02" />
63+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
6464

6565
<PackageVersion Include="ExceptionAnalysis.Diagnostics" Version="1.0.0.39796" />
66-
<PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.46" />
66+
<PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.88" />
6767

6868
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
6969
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />

0 commit comments

Comments
 (0)