Skip to content

Commit 2ae6643

Browse files
trossr32trossr32
authored
Merge pull request #18 from trossr32/outdated-net-upgrade
net8 upgrade & add outdated action
2 parents adf4674 + 306264d commit 2ae6643

File tree

15 files changed

+4049
-174
lines changed

15 files changed

+4049
-174
lines changed

‎.github/workflows/build-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
DOTNET_VERSION: '7.x.x'
11+
DOTNET_VERSION: '8.x.x'
1212
NODE_VERSION: '16.x'
1313
SOLUTION_PATH: 'src/JsonToPowershellClass.sln'
1414
PROJECT_PATH: 'src/JsonToPowershellClass.Blazor/JsonToPowershellClass.Blazor.csproj'

‎.github/workflows/outdated.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Outdated package checks
2+
3+
# Run workflow on pull request to the main branch
4+
on:
5+
pull_request:
6+
types: [opened, synchronize, reopened]
7+
branches: [ main ]
8+
9+
workflow_dispatch:
10+
11+
env:
12+
SOLUTION_PATH: 'src/JsonToPowershellClass.sln'
13+
PROJECT_DIR: 'src/JsonToPowershellClass.Blazor'
14+
15+
jobs:
16+
outdated-packages-check:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: trossr32/[email protected]
21+
with:
22+
use-dotnet-outdated: true
23+
dotnet-solution-path: ${{ env.SOLUTION_PATH }}
24+
use-npm-outdated: true
25+
npm-project-directory: ${{ env.PROJECT_DIR }}

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
## Blazor WASM app
44

5-
A net7.0 Blazor WebAssembly web application that converts JSON to Powershell classes. JSON can be supplied as a string, an uploaded file or a URL API endpoint.
5+
<a href="https://json2ps.app">![Static Badge](https://img.shields.io/badge/json2ps.app-8A2BE2?style=flat&logo=microsoftedge&link=https%3A%2F%2Fjson2ps.app)</a>
6+
7+
A net8.0 Blazor WebAssembly web application that converts JSON to Powershell classes. JSON can be supplied as a string, an uploaded file or a URL API endpoint.
68

79
Hosted with github pages at [json2ps.app](https://json2ps.app/)
810

‎src/CodeMirror6/CodeMirror6.csproj‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
2-
32
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
<OutputType>Library</OutputType>
65
<Nullable>disable</Nullable>
76
<ImplicitUsings>enable</ImplicitUsings>
@@ -19,26 +18,20 @@
1918
<RepositoryUrl>https://github.com/gaelj/BlazorCodeMirror6</RepositoryUrl>
2019
<TrimUnusedDependencies>false</TrimUnusedDependencies>
2120
</PropertyGroup>
22-
2321
<ItemGroup>
2422
<SupportedPlatform Include="browser" />
2523
<SupportedPlatform Include="browser-wasm" />
2624
</ItemGroup>
27-
28-
<ItemGroup>
29-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.5" />
30-
</ItemGroup>
31-
3225
<ItemGroup>
3326
<Folder Include="wwwroot\" />
3427
</ItemGroup>
35-
36-
<Target Name="NpmInit" BeforeTargets="BeforeBuild;BeforeRebuild;Rollup">
28+
<Target Name="NpmInit" BeforeTargets="BeforeBuild;BeforeRebuild;Rollup">
3729
<Exec Command="cd NodeLib &amp;&amp; npm install" />
3830
</Target>
39-
40-
<Target Name="Rollup" BeforeTargets="BeforeBuild;BeforeRebuild">
31+
<Target Name="Rollup" BeforeTargets="BeforeBuild;BeforeRebuild">
4132
<Exec Command="cd NodeLib &amp;&amp; npx rollup --config" />
4233
</Target>
43-
44-
</Project>
34+
<ItemGroup>
35+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
36+
</ItemGroup>
37+
</Project>

‎src/JsonToPowershellClass.Blazor/Extensions/UrlExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace JsonToPowershellClass.Blazor.Extensions;
44

55
public static partial class UrlExtensions
66
{
7-
[GeneratedRegex("^(?:http(s)?:\\/\\/)?[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\._~:/?#[\\]@!\\$&'\\(\\)\\*\\+,;=.]+$", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-GB")]
7+
[GeneratedRegex(@"^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-GB")]
88
private static partial Regex UrlRegex();
99

1010
/// <summary>

‎src/JsonToPowershellClass.Blazor/JsonToPowershellClass.Blazor.csproj‎

Lines changed: 39 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,40 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
<Nullable>disable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<NpmLastInstall>node_modules/.last-install</NpmLastInstall>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<PackageReference Include="Flurl.Http" Version="3.2.4" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
13-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.5" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
15-
<PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.0.2" />
16-
<PackageReference Include="SoloX.BlazorJsBlob" Version="1.0.2" />
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<ProjectReference Include="..\CodeMirror6\CodeMirror6.csproj" />
21-
<ProjectReference Include="..\JsonToPowershellClass\JsonToPowershellClass.Core.csproj" />
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<Content Update="wwwroot\img\powershell.json.logo-1024x1024.png">
26-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
27-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
28-
</Content>
29-
</ItemGroup>
30-
31-
<Target Name="CheckForNpm" BeforeTargets="NpmInstall">
32-
<Exec Command="npm -v" ContinueOnError="true">
33-
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
34-
</Exec>
35-
<Error Condition="'$(ErrorCode)' != '0'" Text="You must install NPM to build this project" />
36-
</Target>
37-
38-
<Target Name="NpmInstall" BeforeTargets="BuildCSS" Inputs="package.json" Outputs="$(NpmLastInstall)">
39-
<Exec Command="npm install" />
40-
<Touch Files="$(NpmLastInstall)" AlwaysCreate="true" />
41-
</Target>
42-
43-
<Target Name="BuildCSS" BeforeTargets="Compile">
44-
<Exec Command="npm run build" Condition=" '$(Configuration)' == 'Debug' " />
45-
<Exec Command="npm run release" Condition=" '$(Configuration)' == 'Release' " />
46-
</Target>
47-
</Project>
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<Nullable>disable</Nullable>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<NpmLastInstall>node_modules/.last-install</NpmLastInstall>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Flurl.Http" Version="4.0.0" />
10+
<PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.1.1" />
11+
<PackageReference Include="SoloX.BlazorJsBlob" Version="1.0.2" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<ProjectReference Include="..\CodeMirror6\CodeMirror6.csproj" />
18+
<ProjectReference Include="..\JsonToPowershellClass\JsonToPowershellClass.Core.csproj" />
19+
</ItemGroup>
20+
<ItemGroup>
21+
<Content Update="wwwroot\img\powershell.json.logo-1024x1024.png">
22+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
23+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
24+
</Content>
25+
</ItemGroup>
26+
<Target Name="CheckForNpm" BeforeTargets="NpmInstall">
27+
<Exec Command="npm -v" ContinueOnError="true">
28+
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
29+
</Exec>
30+
<Error Condition="'$(ErrorCode)' != '0'" Text="You must install NPM to build this project" />
31+
</Target>
32+
<Target Name="NpmInstall" BeforeTargets="BuildCSS" Inputs="package.json" Outputs="$(NpmLastInstall)">
33+
<Exec Command="npm install" />
34+
<Touch Files="$(NpmLastInstall)" AlwaysCreate="true" />
35+
</Target>
36+
<Target Name="BuildCSS" BeforeTargets="Compile">
37+
<Exec Command="npm run build" Condition=" '$(Configuration)' == 'Debug' " />
38+
<Exec Command="npm run release" Condition=" '$(Configuration)' == 'Release' " />
39+
</Target>
40+
</Project>

‎src/JsonToPowershellClass.Blazor/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
builder.RootComponents.Add<App>("#app");
1111
builder.RootComponents.Add<HeadOutlet>("head::after");
1212

13-
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
13+
builder.Services.AddScoped(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
1414

1515
builder.Services.AddTransient<IJsonClassGeneratorService, JsonClassGeneratorService>();
1616
builder.Services.AddSingleton<BrowserService>();

‎src/JsonToPowershellClass.Blazor/Shared/Footer.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
<div class="float-left mr-2">
99
<a href="https://robgreen.me" target="_blank">
10-
<img src="img/transparent.white.logo.png" class="w-6 h-6"/>
10+
<img src="img/transparent.white.logo.png" class="w-6 h-6" alt="Rob Green Engineering Ltd logo"/>
1111
</a>
1212
</div>
1313
<div class="float-left mr-2">

0 commit comments

Comments
 (0)