Skip to content

Commit 5d004ae

Browse files
authored
Merge pull request #136 from CycloneDX/v1_6
Add support for CycloneDX v1.6
2 parents 805835d + c4e60ab commit 5d004ae

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/CycloneDX.WebTool/Pages/Convert.razor

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
<label>
6161
Version (ignored for SPDX output)
6262
<select id="outputVersion" @bind="_outputVersion">
63-
<option value="v1_5" selected="selected">v1.5</option>
63+
<option value="v1_6" selected="selected">v1.6</option>
64+
<option value="v1_5">v1.5</option>
6465
<option value="v1_4">v1.4</option>
6566
<option value="v1_3">v1.3</option>
6667
<option value="v1_2">v1.2</option>
@@ -77,7 +78,7 @@
7778
private string _userInputFilename;
7879
private string _inputFormat = "autodetect";
7980
private string _outputFormat = "json";
80-
private string _outputVersion = "v1_5";
81+
private string _outputVersion = "v1_6";
8182

8283
private async Task Alert(string message)
8384
{

src/CycloneDX.WebTool/Pages/Merge.razor

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
<label>
5858
Version
5959
<select id="outputVersion" @bind="_outputVersion">
60-
<option value="v1_5" selected="selected">v1.5</option>
60+
<option value="v1_6" selected="selected">v1.6</option>
61+
<option value="v1_5">v1.5</option>
6162
<option value="v1_4">v1.4</option>
6263
<option value="v1_3">v1.3</option>
6364
<option value="v1_2">v1.2</option>
@@ -74,7 +75,7 @@
7475
private List<string> _userInputFilenames;
7576
private string _inputFormat = "autodetect";
7677
private string _outputFormat = "json";
77-
private string _outputVersion = "v1_5";
78+
private string _outputVersion = "v1_6";
7879

7980
private async Task Alert(string message)
8081
{

src/CycloneDX.WebTool/Pages/Validate.razor

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
<label>
4646
Version
4747
<select id="inputVersion" @bind="_inputVersion">
48-
<option value="v1_5" selected="selected">v1.5</option>
48+
<option value="v1_6" selected="selected">v1.6</option>
49+
<option value="v1_5">v1.5</option>
4950
<option value="v1_4">v1.4</option>
5051
<option value="v1_3">v1.3</option>
5152
<option value="v1_2">v1.2</option>
@@ -63,7 +64,7 @@
6364
private string _inputFileContents;
6465
private string _userInputFilename;
6566
private string _inputFormat = "autodetect";
66-
private string _inputVersion = "v1_5";
67+
private string _inputVersion = "v1_6";
6768
private string _validationMessage = "";
6869

6970
private async Task Alert(string message)

0 commit comments

Comments
 (0)