Skip to content

Commit

Permalink
Bump to roslyn 4.8 (nov/2023) which should be prevalent now
Browse files Browse the repository at this point in the history
This unifies dependencies with Orleans code generator so it's pretty much required anyway.
  • Loading branch information
kzu committed Nov 19, 2024
1 parent c840fd5 commit 825b9a2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
7 changes: 4 additions & 3 deletions src/CloudActors.CodeAnalysis/CloudActors.CodeAnalysis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- CS8785: ignoring Orleans source generator being run due to https://github.com/NuGet/Home/issues/6279 -->
<NoWarn>RS1036;CS8785</NoWarn>

<PackFolder>analyzers/dotnet/roslyn4.5/cs</PackFolder>
<PackFolder>analyzers/dotnet/roslyn4.8/cs</PackFolder>
<!-- See https://github.com/scriban/scriban#source-embedding -->
<PackageScribanIncludeSource>true</PackageScribanIncludeSource>
</PropertyGroup>
Expand All @@ -22,12 +22,13 @@
the Orleans source generator in this analyzer project itself, even if we don't want/need to. -->
<PackageReference Include="Microsoft.Orleans.CodeGenerator" Version="$(OrleansVersion)" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="NuGetizer" Version="1.2.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" Version="4.8.0" />
<PackageReference Include="PolySharp" PrivateAssets="All" Version="1.14.1" />

<PackageReference Include="Scriban" Version="5.12.0" Pack="false" IncludeAssets="build" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="2.0.8" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Resources" Version="2.0.8" PrivateAssets="all" Pack="false" />
</ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions src/CloudActors.CodeFix/CloudActors.CodeFix.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
<IsRoslynComponent>true</IsRoslynComponent>
<NoWarn>RS1036</NoWarn>

<PackFolder>analyzers/dotnet/roslyn4.5/cs</PackFolder>
<PackFolder>analyzers/dotnet/roslyn4.8/cs</PackFolder>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NuGetizer" Version="1.2.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Pack="false" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" Version="4.8.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Pack="false" Version="4.8.0" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="PolySharp" PrivateAssets="All" Version="1.14.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- CS8785: ignoring Orleans source generator being run due to https://github.com/NuGet/Home/issues/6279 -->
<NoWarn>RS1036;CS8785</NoWarn>

<PackFolder>analyzers/dotnet/roslyn4.5/cs</PackFolder>
<PackFolder>analyzers/dotnet/roslyn4.8/cs</PackFolder>
<!-- See https://github.com/scriban/scriban#source-embedding -->
<PackageScribanIncludeSource>true</PackageScribanIncludeSource>
</PropertyGroup>
Expand All @@ -22,10 +22,12 @@
the Orleans source generator in this analyzer project itself, even if we don't want/need to. -->
<PackageReference Include="Microsoft.Orleans.CodeGenerator" Version="$(OrleansVersion)" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="NuGetizer" Version="1.2.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" Version="4.8.0" />
<PackageReference Include="PolySharp" PrivateAssets="All" Version="1.14.1" />

<PackageReference Include="Scriban" Version="5.12.0" Pack="false" IncludeAssets="build" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="2.0.8" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Resources" Version="2.0.8" PrivateAssets="all" Pack="false" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageReference Include="coverlet.collector" Version="6.0.2" />
Expand Down

0 comments on commit 825b9a2

Please sign in to comment.