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

Jump to bottom

Feature/support 1.6 #130

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feature/support 1.6 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6e8c01
Add support for v1.6
olexandrbig Aug 16, 2024
a4ed00b
fix codestyle
olexandrbig Aug 16, 2024
ca9f6ef
bump version
olexandrbig Aug 16, 2024
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 semver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.0
0.7.0
8 changes: 4 additions & 4 deletions src/CycloneDX.WebTool/CycloneDX.WebTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CycloneDX.Utils" Version="6.0.0" />
<PackageReference Include="CycloneDX.Spdx.Interop" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.10" PrivateAssets="all" />
<PackageReference Include="CycloneDX.Utils" Version="7.1.0" />
<PackageReference Include="CycloneDX.Spdx.Interop" Version="7.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.33" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.33" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/CycloneDX.WebTool/Pages/Convert.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
<label>
Version (ignored for SPDX output)
<select id="outputVersion" @bind="_outputVersion">
<option value="v1_5" selected="selected">v1.5</option>
<option value="v1_6" selected="selected">v1.6</option>
<option value="v1_5">v1.5</option>
<option value="v1_4">v1.4</option>
<option value="v1_3">v1.3</option>
<option value="v1_2">v1.2</option>
Expand All @@ -77,7 +78,7 @@
private string _userInputFilename;
private string _inputFormat = "autodetect";
private string _outputFormat = "json";
private string _outputVersion = "v1_5";
private string _outputVersion = "v1_6";

private async Task Alert(string message)
{
Expand Down
5 changes: 3 additions & 2 deletions src/CycloneDX.WebTool/Pages/Merge.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
<label>
Version
<select id="outputVersion" @bind="_outputVersion">
<option value="v1_5" selected="selected">v1.5</option>
<option value="v1_6" selected="selected">v1.6</option>
<option value="v1_5">v1.5</option>
<option value="v1_4">v1.4</option>
<option value="v1_3">v1.3</option>
<option value="v1_2">v1.2</option>
Expand All @@ -74,7 +75,7 @@
private List<string> _userInputFilenames;
private string _inputFormat = "autodetect";
private string _outputFormat = "json";
private string _outputVersion = "v1_5";
private string _outputVersion = "v1_6";

private async Task Alert(string message)
{
Expand Down
5 changes: 3 additions & 2 deletions src/CycloneDX.WebTool/Pages/Validate.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
<label>
Version
<select id="inputVersion" @bind="_inputVersion">
<option value="v1_5" selected="selected">v1.5</option>
<option value="v1_6" selected="selected">v1.6</option>
<option value="v1_5">v1.5</option>
<option value="v1_4">v1.4</option>
<option value="v1_3">v1.3</option>
<option value="v1_2">v1.2</option>
Expand All @@ -63,7 +64,7 @@
private string _inputFileContents;
private string _userInputFilename;
private string _inputFormat = "autodetect";
private string _inputVersion = "v1_5";
private string _inputVersion = "v1_6";
private string _validationMessage = "";

private async Task Alert(string message)
Expand Down