Skip to content

Commit a517c4e

Browse files
authored
Merge branch 'main' into dependabot/nuget/Perfolizer-0.3.17
2 parents 7427520 + 0c94a0b commit a517c4e

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

Diff for: .github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
build:
3333
strategy:
3434
matrix:
35-
os: [windows-latest, ubuntu-latest]
35+
os: [ubuntu-latest]
3636

3737
runs-on: ${{ matrix.os }}
3838

Diff for: .github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/download-artifact@v4
3131
with:
3232
path: packages
33-
pattern: packages-windows-*
33+
pattern: packages-ubuntu-*
3434
merge-multiple: true
3535
- name: Publish NuGet package
3636
shell: pwsh

Diff for: Directory.Packages.props

+7-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
These items impact our compatibility with SDK versions, so follow
1313
to strike a balance between compatibility and modernity.
1414
15-
These are the two main documents to reference how the Public API impacts users:
16-
- https://github.com/dotnet/roslyn/blob/main/docs/wiki/NuGet-packages.md
15+
These are the three main documents to reference how the Public API impacts users:
16+
- https://github.com/dotnet/roslyn/blob/main/docs/wiki/NuGet-packages.md?plain=1
17+
- https://learn.microsoft.com/en-us/dotnet/core/porting/versioning-sdk-msbuild-vs#lifecycle
1718
- https://learn.microsoft.com/en-us/visualstudio/productinfo/vs-servicing
1819
-->
19-
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
20-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" />
20+
<!-- We are using 4.8, which introduces .NET 8 and supports VS 2022 17.8 -->
21+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8" />
2123
</ItemGroup>
2224
<ItemGroup>
25+
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
2326
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
2427
<PackageVersion Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.12" />
2528
<PackageVersion Include="GetPackFromProject" Version="1.0.6" />

Diff for: global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"version": "9.0.100",
4-
"rollForward": "disable" /* setup-dotnet is broken and we don't want to have differences in CI vs local, so make this disabled */
4+
"rollForward": "patch" /* setup-dotnet is broken and we don't want to have differences in CI vs local, so make this disabled */
55
},
66
"msbuild-sdks": {
77
"DotNet.ReproducibleBuilds.Isolated": "1.2.4"

Diff for: src/tools/PerfDiff/PerfDiff.csproj

+1-1
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
<NonShipping>true</NonShipping>
77
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
88
</PropertyGroup>

Diff for: tests/EffectiveCSharp.Analyzers.Benchmarks/Helpers/BenchmarkCSharpCompilationFactory.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ internal static class BenchmarkCSharpCompilationFactory
1616
throw new InvalidOperationException("Failed to create compilation");
1717
}
1818

19-
CompilationWithAnalyzers baseline = compilation.WithAnalyzers([new EmptyDiagnosticAnalyzer()], options, CancellationToken.None);
20-
CompilationWithAnalyzers test = compilation.WithAnalyzers([new TAnalyzer()], options, CancellationToken.None);
19+
CompilationWithAnalyzers baseline = compilation.WithAnalyzers([new EmptyDiagnosticAnalyzer()], options);
20+
CompilationWithAnalyzers test = compilation.WithAnalyzers([new TAnalyzer()], options);
2121

2222
return (baseline, test);
2323
}
@@ -35,9 +35,9 @@ internal static class BenchmarkCSharpCompilationFactory
3535
throw new InvalidOperationException("Failed to create compilation");
3636
}
3737

38-
CompilationWithAnalyzers baseline = compilation.WithAnalyzers([new EmptyDiagnosticAnalyzer()], options, CancellationToken.None);
39-
CompilationWithAnalyzers test1 = compilation.WithAnalyzers([new TAnalyzer1()], options, CancellationToken.None);
40-
CompilationWithAnalyzers test2 = compilation.WithAnalyzers([new TAnalyzer2()], options, CancellationToken.None);
38+
CompilationWithAnalyzers baseline = compilation.WithAnalyzers([new EmptyDiagnosticAnalyzer()], options);
39+
CompilationWithAnalyzers test1 = compilation.WithAnalyzers([new TAnalyzer1()], options);
40+
CompilationWithAnalyzers test2 = compilation.WithAnalyzers([new TAnalyzer2()], options);
4141

4242
return (baseline, test1, test2);
4343
}

0 commit comments

Comments
 (0)