Skip to content

Commit 16e2953

Browse files
usercodeusercode
committed
Renamed ImageWizard.Generator
1 parent 0fe2150 commit 16e2953

24 files changed

Lines changed: 67 additions & 44 deletions

File tree

‎.github/workflows/dotnetcore.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ jobs:
4646
run: dotnet nuget push "./src/ImageWizard.OpenGraph/bin/Release/*.nupkg" -s "https://api.nuget.org/v3/index.json" -k ${{secrets.NUGET_API_KEY}}
4747
- name: Publish "ImageWizard.PuppeteerSharp" to nuget
4848
run: dotnet nuget push "./src/ImageWizard.PuppeteerSharp/bin/Release/*.nupkg" -s "https://api.nuget.org/v3/index.json" -k ${{secrets.NUGET_API_KEY}}
49-
- name: Publish "ImageWizard.Generators" to nuget
50-
run: dotnet nuget push "./src/ImageWizard.Generators/bin/Release/*.nupkg" -s "https://api.nuget.org/v3/index.json" -k ${{secrets.NUGET_API_KEY}}
49+
- name: Publish "ImageWizard.Generator" to nuget
50+
run: dotnet nuget push "./src/ImageWizard.Generator/bin/Release/*.nupkg" -s "https://api.nuget.org/v3/index.json" -k ${{secrets.NUGET_API_KEY}}
5151

‎src/ImageWizard.Client/Builder/UrlBuilderContext.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ public string BuildUrl()
5151
return LoaderSource;
5252
}
5353

54-
IUrlSignature signatureService = ServiceProvider.GetRequiredService<IUrlSignature>();
55-
5654
string signature = ImageWizardDefaults.Unsafe;
5755

5856
ImageWizardUrl url = new ImageWizardUrl(LoaderType, LoaderSource, Filters.ToArray());
5957

6058
if (ImageUrlBuilder.Settings.UseUnsafeUrl == false)
6159
{
60+
IUrlSignature signatureService = ServiceProvider.GetRequiredService<IUrlSignature>();
61+
6262
signature = signatureService.Encrypt(ImageUrlBuilder.Settings.Key, new ImageWizardRequest(url, new HostString(ImageUrlBuilder.Settings.Host)));
6363
}
6464

‎src/ImageWizard.Client/Extensions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public static IServiceCollection AddImageWizardClient(this IServiceCollection se
2222
services.Configure(options);
2323
}
2424

25-
services.AddHttpContextAccessor();
2625
services.AddTransient<IImageWizardUrlBuilder, UrlBuilder>();
2726

2827
services.AddSingleton<IUrlSignature, HMACSHA256UrlSignature>();

‎src/ImageWizard.Client/TagHelpers/YoutubeTagHelper.cs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,37 @@ public class YoutubeTagHelper : TagHelper
1717
public YoutubeTagHelper(IImageWizardUrlBuilder imageUrlBuilder)
1818
{
1919
UrlBuilder = imageUrlBuilder;
20-
21-
Width = 1920;
22-
Height = 1080;
23-
24-
UseNoCookie = true;
2520
}
2621

2722
/// <summary>
2823
/// Width
2924
/// </summary>
30-
public int Width { get; set; }
25+
public int Width { get; set; } = 1920;
3126

3227
/// <summary>
3328
/// Height
3429
/// </summary>
35-
public int Height { get; set; }
30+
public int Height { get; set; } = 1080;
3631

3732
/// <summary>
3833
/// Grayscale
3934
/// </summary>
40-
public bool Grayscale { get; set; }
35+
public bool Grayscale { get; set; } = false;
4136

4237
/// <summary>
4338
/// Blur
4439
/// </summary>
45-
public bool Blur { get; set; }
40+
public bool Blur { get; set; } = false;
4641

4742
/// <summary>
4843
/// VideoId
4944
/// </summary>
50-
public string VideoId { get; set; }
45+
public string? VideoId { get; set; }
5146

5247
/// <summary>
5348
/// Use the youtube-nocookie domain. (default: true)
5449
/// </summary>
55-
public bool UseNoCookie { get; set; }
50+
public bool UseNoCookie { get; set; } = true;
5651

5752
/// <summary>
5853
/// IImageWizardUrlBuilder

‎src/ImageWizard.DocNET/ImageWizard.DocNET.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<ProjectReference Include="..\ImageWizard.Generators\ImageWizard.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
48+
<ProjectReference Include="..\ImageWizard.Generator\ImageWizard.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
4949
</ItemGroup>
5050
</Project>

‎src/ImageWizard.FFMpegCore/ImageWizard.FFMpegCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<ProjectReference Include="..\ImageWizard.Generators\ImageWizard.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
44+
<ProjectReference Include="..\ImageWizard.Generator\ImageWizard.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
4545
</ItemGroup>
4646
</Project>

src/ImageWizard.Generators/FilterGenerator.cs renamed to src/ImageWizard.Generator/FilterGenerator.cs

File renamed without changes.

‎src/ImageWizard.Generator/ImageWizard.Generator.csproj‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
<Nullable>enable</Nullable>
5+
<ImplicitUsings>true</ImplicitUsings>
6+
<LangVersion>Latest</LangVersion>
7+
<Authors>usercode</Authors>
8+
<PackageProjectUrl>https://github.com/usercode/ImageWizard</PackageProjectUrl>
9+
<Description>Image processing middleware based on ASP.NET and ImageSharp / SkiaSharp / SvgNet.</Description>
10+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
11+
<PackageReadmeFile>readme.md</PackageReadmeFile>
12+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
13+
<PackageIcon>logo.png</PackageIcon>
14+
<PackageTags>cms</PackageTags>
15+
<MinVerTagPrefix>v</MinVerTagPrefix>
16+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
17+
<IncludeBuildOutput>false</IncludeBuildOutput>
18+
<DevelopmentDependency>true</DevelopmentDependency>
19+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
20+
<NoWarn>CS1591</NoWarn>
21+
<IsPackable>true</IsPackable>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<None Include="..\..\logo.png" Pack="true" PackagePath="" />
30+
<None Include="..\..\readme.md" Pack="true" PackagePath="" />
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<PackageReference Include="MinVer" Version="6.0.0">
35+
<PrivateAssets>all</PrivateAssets>
36+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
37+
</PackageReference>
38+
</ItemGroup>
39+
40+
<ItemGroup>
41+
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
42+
</ItemGroup>
43+
44+
<ItemGroup>
45+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" PrivateAssets="all" />
46+
</ItemGroup>
47+
48+
</Project>

src/ImageWizard.Generators/SourceBuilder/Extensions/StringExtensions.cs renamed to src/ImageWizard.Generator/SourceBuilder/Extensions/StringExtensions.cs

File renamed without changes.

src/ImageWizard.Generators/SourceBuilder/Extensions/SyntaxExtensions.cs renamed to src/ImageWizard.Generator/SourceBuilder/Extensions/SyntaxExtensions.cs

File renamed without changes.

0 commit comments

Comments
 (0)