Skip to content

Commit ce70b9d

Browse files
authored
Merge pull request #812 from Sergio0694/dev/fix-generators-targets
Update all analyzer .targets files for 4.9
2 parents a5cad31 + b4c841f commit ce70b9d

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/ComputeSharp.Core/ComputeSharp.Core.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</ItemGroup>
88
</Target>
99

10-
<!-- Remove the analyzer if using Roslyn < 4.5 (ComputeSharp.Core's generators require Roslyn 4.5) -->
10+
<!-- Remove the analyzer if using Roslyn < 4.9 (ComputeSharp.Core's generators require Roslyn 4.9) -->
1111
<Target Name="_ComputeSharpCoreRemoveAnalyzersForRoslyn3"
1212
Condition="'$(CSharpCoreTargetsPath)' != ''"
1313
AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
@@ -29,10 +29,10 @@
2929
<ComputeSharpCoreCurrentCompilerVersion>@(ComputeSharpCoreCurrentCompilerAssemblyIdentity->'%(Version)')</ComputeSharpCoreCurrentCompilerVersion>
3030

3131
<!-- The CurrentCompilerVersionIsNotNewEnough property can now be defined based on the Roslyn assembly version -->
32-
<ComputeSharpCoreCurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(ComputeSharpCoreCurrentCompilerVersion), 4.5))">true</ComputeSharpCoreCurrentCompilerVersionIsNotNewEnough>
32+
<ComputeSharpCoreCurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(ComputeSharpCoreCurrentCompilerVersion), 4.9))">true</ComputeSharpCoreCurrentCompilerVersionIsNotNewEnough>
3333
</PropertyGroup>
3434

35-
<!-- If the Roslyn version is < 4.5, disable the source generators -->
35+
<!-- If the Roslyn version is < 4.9, disable the source generators -->
3636
<ItemGroup Condition ="'$(ComputeSharpCoreCurrentCompilerVersionIsNotNewEnough)' == 'true'">
3737
<Analyzer Remove="@(_ComputeSharpCoreAnalyzer)"/>
3838
</ItemGroup>

src/ComputeSharp.D2D1/ComputeSharp.D2D1.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</ItemGroup>
88
</Target>
99

10-
<!-- Remove the analyzer if using Roslyn < 4.8 (ComputeSharp.D2D1's generators require Roslyn 4.8) -->
10+
<!-- Remove the analyzer if using Roslyn < 4.9 (ComputeSharp.D2D1's generators require Roslyn 4.9) -->
1111
<Target Name="_ComputeSharpD2D1RemoveAnalyzersForRoslyn3"
1212
Condition="'$(CSharpCoreTargetsPath)' != ''"
1313
AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
@@ -29,10 +29,10 @@
2929
<ComputeSharpD2D1CurrentCompilerVersion>@(ComputeSharpD2D1CurrentCompilerAssemblyIdentity->'%(Version)')</ComputeSharpD2D1CurrentCompilerVersion>
3030

3131
<!-- The CurrentCompilerVersionIsNotNewEnough property can now be defined based on the Roslyn assembly version -->
32-
<ComputeSharpD2D1CurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(ComputeSharpD2D1CurrentCompilerVersion), 4.8))">true</ComputeSharpD2D1CurrentCompilerVersionIsNotNewEnough>
32+
<ComputeSharpD2D1CurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(ComputeSharpD2D1CurrentCompilerVersion), 4.9))">true</ComputeSharpD2D1CurrentCompilerVersionIsNotNewEnough>
3333
</PropertyGroup>
3434

35-
<!-- If the Roslyn version is < 4.8, disable the source generators -->
35+
<!-- If the Roslyn version is < 4.9, disable the source generators -->
3636
<ItemGroup Condition ="'$(ComputeSharpD2D1CurrentCompilerVersionIsNotNewEnough)' == 'true'">
3737
<Analyzer Remove="@(_ComputeSharpD2D1Analyzer)"/>
3838
</ItemGroup>
@@ -42,7 +42,7 @@
4242
emitting this manually lets us customize the message to inform developers as to why exactly the generators have been
4343
disabled, and that ComputeSharp will not work at all unless a more up to date IDE or compiler version are used.
4444
-->
45-
<Error Condition ="'$(ComputeSharpD2D1CurrentCompilerVersionIsNotNewEnough)' == 'true'" Text="The ComputeSharp.D2D1 source generators have been disabled on the current configuration, as they need Roslyn 4.8 in order to work. ComputeSharp.D2D1 requires the source generators to run in order to process shaders, so the library cannot be used without a more up to date IDE (eg. VS 2022 17.8 or greater) or .NET SDK version (.NET 8 SDK or greater)."/>
45+
<Error Condition ="'$(ComputeSharpD2D1CurrentCompilerVersionIsNotNewEnough)' == 'true'" Text="The ComputeSharp.D2D1 source generators have been disabled on the current configuration, as they need Roslyn 4.9 in order to work. ComputeSharp.D2D1 requires the source generators to run in order to process shaders, so the library cannot be used without a more up to date IDE (eg. VS 2022 17.8 or greater) or .NET SDK version (.NET 8 SDK or greater)."/>
4646
</Target>
4747

4848
<!-- Remove the analyzer if Roslyn is missing -->

src/ComputeSharp/ComputeSharp.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</ItemGroup>
88
</Target>
99

10-
<!-- Remove the analyzer if using Roslyn < 4.8 (ComputeSharp's generators require Roslyn 4.8) -->
10+
<!-- Remove the analyzer if using Roslyn < 4.9 (ComputeSharp's generators require Roslyn 4.9) -->
1111
<Target Name="_ComputeSharpRemoveAnalyzersForRoslyn3"
1212
Condition="'$(CSharpCoreTargetsPath)' != ''"
1313
AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
@@ -29,10 +29,10 @@
2929
<ComputeSharpCurrentCompilerVersion>@(ComputeSharpCurrentCompilerAssemblyIdentity->'%(Version)')</ComputeSharpCurrentCompilerVersion>
3030

3131
<!-- The CurrentCompilerVersionIsNotNewEnough property can now be defined based on the Roslyn assembly version -->
32-
<ComputeSharpCurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(ComputeSharpCurrentCompilerVersion), 4.8))">true</ComputeSharpCurrentCompilerVersionIsNotNewEnough>
32+
<ComputeSharpCurrentCompilerVersionIsNotNewEnough Condition="$([MSBuild]::VersionLessThan($(ComputeSharpCurrentCompilerVersion), 4.9))">true</ComputeSharpCurrentCompilerVersionIsNotNewEnough>
3333
</PropertyGroup>
3434

35-
<!-- If the Roslyn version is < 4.8, disable the source generators -->
35+
<!-- If the Roslyn version is < 4.9, disable the source generators -->
3636
<ItemGroup Condition ="'$(ComputeSharpCurrentCompilerVersionIsNotNewEnough)' == 'true'">
3737
<Analyzer Remove="@(_ComputeSharpAnalyzer)"/>
3838
</ItemGroup>
@@ -42,7 +42,7 @@
4242
emitting this manually lets us customize the message to inform developers as to why exactly the generators have been
4343
disabled, and that ComputeSharp will not work at all unless a more up to date IDE or compiler version are used.
4444
-->
45-
<Error Condition ="'$(ComputeSharpCurrentCompilerVersionIsNotNewEnough)' == 'true'" Text="The ComputeSharp source generators have been disabled on the current configuration, as they need Roslyn 4.8 in order to work. ComputeSharp requires the source generators to run in order to process shaders, so the library cannot be used without a more up to date IDE (eg. VS 2022 17.8 or greater) or .NET SDK version (.NET 8 SDK or greater)."/>
45+
<Error Condition ="'$(ComputeSharpCurrentCompilerVersionIsNotNewEnough)' == 'true'" Text="The ComputeSharp source generators have been disabled on the current configuration, as they need Roslyn 4.9 in order to work. ComputeSharp requires the source generators to run in order to process shaders, so the library cannot be used without a more up to date IDE (eg. VS 2022 17.8 or greater) or .NET SDK version (.NET 8 SDK or greater)."/>
4646
</Target>
4747

4848
<!-- Remove the analyzer if Roslyn is missing -->

0 commit comments

Comments
 (0)