Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into issue/OSOE-815-analyzers
Browse files Browse the repository at this point in the history
  • Loading branch information
Piedone committed Dec 29, 2024
2 parents 686a7ff + 770df18 commit 674e0dc
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CliWrap" Version="3.6.4" />
<PackageReference Include="CliWrap" Version="3.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="RestEase" Version="1.6.4" />
<PackageReference Include="RestEase.SourceGenerator" Version="1.6.4">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<!-- Take a private dependency on with (PrivateAssets=all) Consumers of this generator will not reference it.
Set GeneratePathProperty=true so we can reference the binaries -->
<PackageReference Include="System.Text.Json" Version="8.0.5" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" GeneratePathProperty="true">
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" GeneratePathProperty="true">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
15 changes: 10 additions & 5 deletions Lombiq.HelpfulLibraries.Tests/Models/ConstantFromJsonSample.cs
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
using Lombiq.HelpfulLibraries.Attributes;
using Lombiq.HelpfulLibraries.Attributes;

namespace Lombiq.HelpfulLibraries.Tests.Models;

/// <summary>
/// Shows how to use the <see cref="ConstantFromJsonAttribute" />.
/// </summary>
[ConstantFromJson(constantName: "GulpUglifyVersion", fileName: "package.json", propertyName: "gulp-uglify")]
[ConstantFromJson(constantName: "GulpVersion", fileName: "package.json", propertyName: "gulp")]
/// <remarks>
/// <para>
/// Using two really simple packages as a test.
/// </para>
/// </remarks>
[ConstantFromJson(constantName: "IsEvenVersion", fileName: "package.json", propertyName: "is-even")]
[ConstantFromJson(constantName: "IsOddVersion", fileName: "package.json", propertyName: "is-odd")]
public partial class ConstantFromJsonSample
{
public string ReturnVersions()
{
var stringBuilder = new System.Text.StringBuilder();
stringBuilder.AppendLine($"Gulp version: {GulpVersion}");
stringBuilder.AppendLine($"Gulp-uglify version: {GulpUglifyVersion}");
stringBuilder.AppendLine($"is-even version: {IsEvenVersion}");
stringBuilder.AppendLine($"is-odd version: {IsOddVersion}");
return stringBuilder.ToString();
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Lombiq.HelpfulLibraries.Tests.Models;
using Lombiq.HelpfulLibraries.Tests.Models;
using Shouldly;
using System;
using Xunit;
Expand All @@ -10,11 +10,11 @@ public class ConstantFromJsonTest
[Fact]
public void TestGeneratedConstants()
{
ConstantFromJsonSample.GulpVersion.ShouldBe("3.9.0");
ConstantFromJsonSample.GulpUglifyVersion.ShouldBe("1.4.1");
ConstantFromJsonSample.IsEvenVersion.ShouldBe("1.0.0");
ConstantFromJsonSample.IsOddVersion.ShouldBe("3.0.1");
new ConstantFromJsonSample()
.ReturnVersions()
.Split(["\n", "\r"], StringSplitOptions.RemoveEmptyEntries)
.ShouldBe(["Gulp version: 3.9.0", "Gulp-uglify version: 1.4.1"]);
.ShouldBe(["is-even version: 1.0.0", "is-odd version: 3.0.1"]);
}
}
19 changes: 2 additions & 17 deletions Lombiq.HelpfulLibraries.Tests/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
{
"private": true,
"devDependencies": {
"fs": "0.0.2",
"glob": "5.0.15",
"path-posix": "1.0.0",
"merge-stream": "1.0.0",
"gulp-if": "2.0.0",
"gulp": "3.9.0",
"gulp-newer": "0.5.1",
"gulp-plumber": "1.0.1",
"gulp-sourcemaps": "1.6.0",
"gulp-less": "3.0.3",
"gulp-autoprefixer": "2.2.0",
"gulp-minify-css": "1.2.1",
"gulp-typescript": "2.9.2",
"gulp-uglify": "1.4.1",
"gulp-rename": "1.2.2",
"gulp-concat": "2.6.0",
"gulp-header": "1.7.1"
"is-even": "1.0.0",
"is-odd": "3.0.1"
},
"dependencies": { }
}
24 changes: 24 additions & 0 deletions renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
'$schema': 'https://docs.renovatebot.com/renovate-schema.json',
'extends': ['github>Lombiq/renovate-config:default-orchard-core-submodule.json5'],
packageRules: [
{
groupName: 'Gulp',
matchPackageNames: [
'gulp*',
],
},
{
groupName: 'Microsoft.Extensions',
matchPackageNames: [
'Microsoft.Extensions.*',
],
},
{
groupName: 'RestEase',
matchPackageNames: [
'RestEase*',
],
},
],
}

0 comments on commit 674e0dc

Please sign in to comment.