Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump #14

Merged
merged 1 commit into from
Dec 18, 2024
Merged

Bump #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Logs are written to a file, `ptrun-lint.log`, in the same directory as the tool
| | Unnecessary dependency: `<dependency>`, already defined in Central Package Management (`Directory.Packages.props`) |
| `PTRUN1501` | Plugin assembly should be valid (`<package>`) |
| | Assembly could not be validated |
| | Target framework should be "`net8.0`" |
| | Target framework should be "`net9.0`" |
| | Target platform should be "`windows`" |
| | Main.PluginID does not match metadata (`plugin.json`) ID |

Expand Down
2 changes: 1 addition & 1 deletion src/Community.PowerToys.Run.Plugin.Lint/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static bool IsChecksumsFile(this Asset asset)

public static bool HasValidTargetFramework(this Package package)
{
return package.AssemblyAttributeValue(typeof(TargetFrameworkAttribute)) == ".NETCoreApp,Version=v8.0";
return package.AssemblyAttributeValue(typeof(TargetFrameworkAttribute)) == ".NETCoreApp,Version=v9.0";
}

public static bool HasValidTargetPlatform(this Package package)
Expand Down
2 changes: 1 addition & 1 deletion src/Community.PowerToys.Run.Plugin.Lint/Rules.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ public IEnumerable<string> Validate()
yield break;
}

if (!package.HasValidTargetFramework()) yield return $"Target framework should be {"net8.0".ToQuote()}";
if (!package.HasValidTargetFramework()) yield return $"Target framework should be {"net9.0".ToQuote()}";
if (!package.HasValidTargetPlatform()) yield return $"Target platform should be {"windows".ToQuote()}";

var pluginId = PluginID(MainTypeDefinition());
Expand Down
4 changes: 2 additions & 2 deletions tests/Community.PowerToys.Run.Plugin.Lint.Tests/ExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void IsChecksumsFile_should_determine_if_Asset_is_checksums_file()
[Test]
public void HasValidTargetFramework_should_validate_Assembly()
{
new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip").Load()
new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip").Load()
.HasValidTargetFramework().Should().BeTrue();
new Package(new(), @"..\..\..\Packages\InvalidTarget-0.82.1-x64.zip").Load()
.HasValidTargetFramework().Should().BeFalse();
Expand All @@ -72,7 +72,7 @@ public void HasValidTargetFramework_should_validate_Assembly()
[Test]
public void HasValidTargetPlatform_should_validate_Assembly()
{
new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip").Load()
new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip").Load()
.HasValidTargetPlatform().Should().BeTrue();
new Package(new(), @"..\..\..\Packages\InvalidTarget-0.82.1-x64.zip").Load()
.HasValidTargetPlatform().Should().BeFalse();
Expand Down
6 changes: 3 additions & 3 deletions tests/Community.PowerToys.Run.Plugin.Lint.Tests/ModelsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ public class ModelsTests
[Test]
public void Package_ctor()
{
var subject = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
var subject = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
subject.Asset.Should().NotBeNull();
subject.FileInfo.Should().NotBeNull();
}

[Test]
public void Package_Load()
{
var subject = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
var subject = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
subject.Load();
subject.FileStream.Should().NotBeNull();
subject.ZipArchive.Should().NotBeNull();
Expand All @@ -30,7 +30,7 @@ public void Package_Load()
[Test]
public void Package_Dispose()
{
var subject = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
var subject = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
subject.Load();
subject.Dispose();
}
Expand Down
Binary file removed tests/Community.PowerToys.Run.Plugin.Lint.Tests/Packages/Valid-0.82.1-arm64.zip
View file
Open in desktop
Binary file not shown.
Binary file removed tests/Community.PowerToys.Run.Plugin.Lint.Tests/Packages/Valid-0.82.1-x64.zip
View file
Open in desktop
Binary file not shown.
Binary file added tests/Community.PowerToys.Run.Plugin.Lint.Tests/Packages/Valid-0.87.0-arm64.zip
View file
Open in desktop
Binary file not shown.
Binary file added tests/Community.PowerToys.Run.Plugin.Lint.Tests/Packages/Valid-0.87.0-x64.zip
View file
Open in desktop
Binary file not shown.
42 changes: 21 additions & 21 deletions tests/Community.PowerToys.Run.Plugin.Lint.Tests/RulesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void ReleaseRules_should_validate_Release()
subject.Validate().Clean().Should().BeEquivalentTo(
"Asset \".zip\" missing");

subject = new ReleaseRules(new() { assets = [new() { name = "Valid-0.82.1.zip", content_type = "application/zip" }] });
subject = new ReleaseRules(new() { assets = [new() { name = "Valid-0.87.0.zip", content_type = "application/zip" }] });
subject.Validate().Clean().Should().BeEquivalentTo(
"Asset \"arm64\" platform missing",
"Asset \"x64\" platform missing");
Expand All @@ -107,8 +107,8 @@ public void ReleaseRules_should_validate_Release()
{
assets =
[
new() { name = "Valid-0.82.1-arm64.zip", content_type = "application/zip" },
new() { name = "Valid-0.82.1-x64.zip", content_type = "application/zip" },
new() { name = "Valid-0.87.0-arm64.zip", content_type = "application/zip" },
new() { name = "Valid-0.87.0-x64.zip", content_type = "application/zip" },
],
};
subject = new ReleaseRules(release);
Expand All @@ -131,7 +131,7 @@ public void ReleaseNotesRules_should_validate_Release_and_Package()
subject.Validate().Clean().Should().BeEquivalentTo(
"Package missing");

var package = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
var package = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
subject = new ReleaseNotesRules(release, package);
subject.Validate().Clean().Should().BeEquivalentTo(
"Package missing");
Expand All @@ -152,7 +152,7 @@ public void PackageRules_should_validate_Package()
subject.Validate().Clean().Should().BeEquivalentTo(
"Filename does not match \"<name>-<version>-<platform>.zip\" convention");

subject = new PackageRules(new(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip"));
subject = new PackageRules(new(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip"));
subject.Validate().Clean().Should().BeEmpty();

subject = new PackageRules(new(new(), @"..\..\..\Packages\Valid.Name-0.82.1-X64.zip"));
Expand All @@ -166,7 +166,7 @@ public void PackageContentRules_should_validate_Package()
subject.Validate().Clean().Should().BeEquivalentTo(
"Package missing");

subject = new PackageContentRules(new(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip"));
subject = new PackageContentRules(new(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip"));
subject.Validate().Clean().Should().BeEquivalentTo(
"Package missing");

Expand Down Expand Up @@ -194,7 +194,7 @@ public void PackageContentRules_should_validate_Package()
subject.Validate().Clean().Should().BeEquivalentTo(
"Assembly \".dll\" missing");

package = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
package = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
package.Load();
subject = new PackageContentRules(package);
subject.Validate().Clean().Should().BeEmpty();
Expand All @@ -203,36 +203,36 @@ public void PackageContentRules_should_validate_Package()
[Test]
public void PackageChecksumRules_should_validate_Package()
{
var subject = new PackageChecksumRules(null!, new(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip"), []);
var subject = new PackageChecksumRules(null!, new(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip"), []);
subject.Validate().Clean().Should().BeEquivalentTo(
"Release notes missing");

subject = new PackageChecksumRules(new(), new(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip"), []);
subject = new PackageChecksumRules(new(), new(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip"), []);
subject.Validate().Clean().Should().BeEquivalentTo(
"Release notes missing");

subject = new PackageChecksumRules(new() { body = "" }, new(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip"), []);
subject = new PackageChecksumRules(new() { body = "" }, new(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip"), []);
subject.Validate().Clean().Should().BeEquivalentTo(
"Package missing");

var package = new Package(new() { name = "Valid-0.82.1-x64.zip" }, @"..\..\..\Packages\Valid-0.82.1-x64.zip");
var package = new Package(new() { name = "Valid-0.87.0-x64.zip" }, @"..\..\..\Packages\Valid-0.87.0-x64.zip");
package.Load();
subject = new PackageChecksumRules(new() { body = "" }, package, []);
subject.Validate().Clean().Should().BeEquivalentTo(
"Hash \"17AE81ECE0F201AE364047B63BDB052931614EDD49D860E562B277E6D3FA806A\" missing");
"Hash \"C2D1C03203B769563C62FD17517333849E630B721F4565BCD05D0B8720F6C6BD\" missing");

subject = new PackageChecksumRules(new() { body = "" }, package, null!);
subject.Validate().Clean().Should().BeEquivalentTo(
"Hash \"17AE81ECE0F201AE364047B63BDB052931614EDD49D860E562B277E6D3FA806A\" missing");
"Hash \"C2D1C03203B769563C62FD17517333849E630B721F4565BCD05D0B8720F6C6BD\" missing");

var release = new Release
{
body = "17AE81ECE0F201AE364047B63BDB052931614EDD49D860E562B277E6D3FA806A",
body = "C2D1C03203B769563C62FD17517333849E630B721F4565BCD05D0B8720F6C6BD",
};
subject = new PackageChecksumRules(release, package, []);
subject.Validate().Clean().Should().BeEmpty();

var checksum = new Checksum("17AE81ECE0F201AE364047B63BDB052931614EDD49D860E562B277E6D3FA806A", "Valid-0.82.1-x64.zip");
var checksum = new Checksum("C2D1C03203B769563C62FD17517333849E630B721F4565BCD05D0B8720F6C6BD", "Valid-0.87.0-x64.zip");
subject = new PackageChecksumRules(new() { body = "" }, package, [checksum]);
subject.Validate().Clean().Should().BeEmpty();
}
Expand All @@ -244,7 +244,7 @@ public void PluginMetadataRules_should_validate_Package()
subject.Validate().Clean().Should().BeEquivalentTo(
"Package missing");

var package = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
var package = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
package.Load();
subject = new PluginMetadataRules(package, null!, new());
subject.Validate().Clean().Should().BeEquivalentTo(
Expand All @@ -256,7 +256,7 @@ public void PluginMetadataRules_should_validate_Package()
subject.Validate().Clean().Should().BeEquivalentTo(
"Package missing");

package = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
package = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
package.Load();
SetMetadata(package, new Metadata
{
Expand Down Expand Up @@ -290,7 +290,7 @@ public void PluginMetadataRules_should_validate_Package()
"IcoPathLight missing in package",
"DynamicLoading is unnecessary");

package = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
package = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
package.Load();
var user = new User { login = "hlaueriksson" };
subject = new PluginMetadataRules(package, repository, user);
Expand Down Expand Up @@ -327,7 +327,7 @@ public void PluginDependenciesRules_should_validate_Package()
"Unnecessary dependency: Newtonsoft.Json, consider using System.Text.Json",
"Unnecessary dependency: LazyCache, already defined in Central Package Management (Directory.Packages.props)");

package = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
package = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
package.Load();
subject = new PluginDependenciesRules(package);
subject.Validate().Clean().Should().BeEmpty();
Expand All @@ -344,11 +344,11 @@ public void AssemblyRules_should_validate_Package()
package.Load();
subject = new AssemblyRules(package);
subject.Validate().Clean().Should().BeEquivalentTo(
"Target framework should be \"net8.0\"",
"Target framework should be \"net9.0\"",
"Target platform should be \"windows\"",
"Main.PluginID does not match metadata (plugin.json) ID");

package = new Package(new(), @"..\..\..\Packages\Valid-0.82.1-x64.zip");
package = new Package(new(), @"..\..\..\Packages\Valid-0.87.0-x64.zip");
package.Load();
subject = new AssemblyRules(package);
subject.Validate().Clean().Should().BeEmpty();
Expand Down