Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AnalyzerTesting.CSharp.Extensions" Version="1.2.2" />
<PackageVersion Include="Fody" Version="6.9.3" />
<PackageVersion Include="FodyHelpers" Version="6.9.3" />
<PackageVersion Include="FodyPackaging" Version="6.9.3" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.6.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3" />
<PackageVersion Include="Nullable.Extended.Analyzer" Version="1.15.6581" />
<PackageVersion Include="PropertyChanging.Fody" Version="1.31.0" />
<PackageVersion Include="Verify.ICSharpCode.Decompiler" Version="3.4.1" />
<PackageVersion Include="Verify.XunitV3" Version="31.20.0" />
<PackageVersion Include="xunit.v3" Version="3.2.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
56 changes: 28 additions & 28 deletions PropertyChanged.Fody.Analyzer.Tests/CodeGeneratorTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Class1 : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

Assert.Empty(generated);
}
Expand All @@ -46,7 +46,7 @@ public partial class Class1 : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

Assert.Empty(generated);
}
Expand All @@ -65,7 +65,7 @@ public partial class Class1 : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);
await Verify(generated);
}

Expand All @@ -85,10 +85,10 @@ public partial record Class1 : {|#0:INotifyPropertyChanged|}
""";
var test = new Test(source)
{
ExpectedDiagnostics = {CS0535.WithArguments("Class1", "System.ComponentModel.INotifyPropertyChanged.PropertyChanged")}
ExpectedDiagnostics = { CS0535.WithArguments("Class1", "System.ComponentModel.INotifyPropertyChanged.PropertyChanged") }
};

var generated = await test.RunAsync();
var generated = await test.RunAsync(TestContext.Current.CancellationToken);

Assert.Empty(generated);
}
Expand All @@ -105,7 +105,7 @@ public partial class Class1 : System.ComponentModel.INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -124,7 +124,7 @@ public partial class Class1<T1, T2> : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -147,7 +147,7 @@ public partial class Class1
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

Assert.Empty(generated);
}
Expand Down Expand Up @@ -176,7 +176,7 @@ public partial class Class1
}

""";
var generated = await new Test(source1, source2).RunAsync();
var generated = await new Test(source1, source2).RunAsync(TestContext.Current.CancellationToken);

Assert.Empty(generated);
}
Expand Down Expand Up @@ -204,7 +204,7 @@ public partial class Class1 : INotifyPropertyChanged
}

""";
var generated = await new Test(source1, source2).RunAsync();
var generated = await new Test(source1, source2).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand Down Expand Up @@ -234,7 +234,7 @@ public partial class Class1234
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -255,10 +255,10 @@ public partial struct Class1 : {|#0:INotifyPropertyChanged|}
""";
var test = new Test(source)
{
ExpectedDiagnostics = {CS0535.WithArguments("Class1", "System.ComponentModel.INotifyPropertyChanged.PropertyChanged")}
ExpectedDiagnostics = { CS0535.WithArguments("Class1", "System.ComponentModel.INotifyPropertyChanged.PropertyChanged") }
};

var generated = await test.RunAsync();
var generated = await test.RunAsync(TestContext.Current.CancellationToken);

Assert.Empty(generated);
}
Expand All @@ -278,7 +278,7 @@ public partial class Class1
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -298,7 +298,7 @@ public partial record Class1
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

Assert.Empty(generated);
}
Expand All @@ -320,7 +320,7 @@ public partial class Class1 : Attribute, INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -345,7 +345,7 @@ public partial class Class2 : Class1
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -370,7 +370,7 @@ public partial class Class2 : Class1
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -392,7 +392,7 @@ public partial class Class1
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -412,7 +412,7 @@ public partial class Class1<T>
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -432,7 +432,7 @@ public sealed partial class Class1
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand Down Expand Up @@ -489,7 +489,7 @@ public partial class Class2a : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand Down Expand Up @@ -522,7 +522,7 @@ public partial class Class3 : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -548,7 +548,7 @@ public partial class Class2 : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand All @@ -574,7 +574,7 @@ public partial class Class2 : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand Down Expand Up @@ -608,7 +608,7 @@ partial class Class : INotifyPropertyChanged
}

""";
var generated = await new Test(source).RunAsync();
var generated = await new Test(source).RunAsync(TestContext.Current.CancellationToken);

await Verify(generated);
}
Expand Down Expand Up @@ -641,10 +641,10 @@ public partial class Class3 : {|#0:INotifyPropertyChanged|}
""";
var test = new Test(source)
{
ExpectedDiagnostics = {CS0535.WithArguments("Class1.Class2.Class3", "System.ComponentModel.INotifyPropertyChanged.PropertyChanged")}
ExpectedDiagnostics = { CS0535.WithArguments("Class1.Class2.Class3", "System.ComponentModel.INotifyPropertyChanged.PropertyChanged") }
};

var generated = await test.RunAsync();
var generated = await test.RunAsync(TestContext.Current.CancellationToken);

Assert.Empty(generated);
}
Expand Down
1 change: 0 additions & 1 deletion PropertyChanged.Fody.Analyzer.Tests/GlobalUsings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
global using AnalyzerTesting.CSharp.Extensions;
global using Microsoft.CodeAnalysis;
global using Microsoft.CodeAnalysis.Testing;
global using Microsoft.CodeAnalysis.Testing.Verifiers;
global using Microsoft.CodeAnalysis.Text;
global using PropertyChanged;
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DisableFody>true</DisableFody>
<IsPackable>false</IsPackable>
<OutputType>Exe</OutputType>
Comment thread
tom-englert marked this conversation as resolved.
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AnalyzerTesting.CSharp.Extensions" Version="1.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" NoWarn="NU1608" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" NoWarn="NU1608" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Verify.Xunit" Version="26.2.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
<PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
<PackageReference Include="AnalyzerTesting.CSharp.Extensions" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Verify.XunitV3" />
<PackageReference Include="xunit.v3" />
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PropertyChanged\PropertyChanged.csproj" />
<ProjectReference Include="..\PropertyChanged.Fody.Analyzer\PropertyChanged.Fody.Analyzer.csproj" NoWarn="NU1608" />
</ItemGroup>

</Project>
</Project>
2 changes: 2 additions & 0 deletions PropertyChanged.Fody.Analyzer/ExtensionMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ public static IEnumerable<INamedTypeSymbol> EnumerateBaseTypes(this INamedTypeSy
[Conditional("DEBUG")]
public static void DebugBeep()
{
#pragma warning disable RS1035 // Do not use APIs banned for analyzers
Task.Run(Console.Beep);
#pragma warning restore RS1035 // Do not use APIs banned for analyzers
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[4.0.1]" PrivateAssets="all" />
<PackageReference Include="Nullable.Extended.Analyzer" Version="1.10.4539" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" VersionOverride="3.3.4" PrivateAssets="all" IsPinned="true" Justification="Stick with this version for compatibility with older VS versions"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="4.0.1" PrivateAssets="all" IsPinned="true" Justification="Stick with this version for compatibility with older VS versions"/>
<PackageReference Include="Nullable.Extended.Analyzer" PrivateAssets="all" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion PropertyChanged.Fody/PropertyChanged.Fody.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FodyHelpers" Version="6.8.0" />
<PackageReference Include="FodyHelpers" />
</ItemGroup>
</Project>
7 changes: 4 additions & 3 deletions PropertyChanged.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32630.192
# Visual Studio Version 18
VisualStudioVersion = 18.8.11925.187 insiders
Comment thread
tom-englert marked this conversation as resolved.
MinimumVisualStudioVersion = 16.0.29201.188
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssemblies", "TestAssemblies", "{546A6338-E25E-4796-AF08-A4742E3BDF7B}"
EndProject
Expand Down Expand Up @@ -45,8 +45,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
appveyor.yml = appveyor.yml
Directory.Build.props = Directory.Build.props
readme.md = readme.md
Directory.Packages.props = Directory.Packages.props
global.json = global.json
readme.md = readme.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyWithAttributeAndEvent", "TestAssemblies\AssemblyWithAttributeAndEvent\AssemblyWithAttributeAndEvent.csproj", "{B28F547A-87F9-4F65-96DC-7911DEAB07AA}"
Expand Down
6 changes: 3 additions & 3 deletions PropertyChanged/PropertyChanged.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<WeaverPropsFile>$(MSBuildThisFileDirectory)Weaver.props</WeaverPropsFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="none" />
<PackageReference Include="FodyPackaging" Version="6.8.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="Fody" PrivateAssets="none" />
<PackageReference Include="FodyPackaging" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" PrivateAssets="All" />
<ProjectReference Include="..\PropertyChanged.Fody.Analyzer/PropertyChanged.Fody.Analyzer.csproj" ReferenceOutputAssembly="false" Condition="'$(TargetFrameworkIdentifier)'!='.NetFramework'" />
<None Include="..\PropertyChanged.Fody.Analyzer\bin\$(Configuration)\netstandard2.0\PropertyChanged.Fody.Analyzer.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup>
Expand Down
Loading