From e6e8c011b6495ec8b360ebf79f911982de77a164 Mon Sep 17 00:00:00 2001
From: Oleksandr Dmukhovskyi <olexandrbig@gmail.com>
Date: Fri, 16 Aug 2024 17:31:59 +0300
Subject: [PATCH 1/3] Add support for v1.6

---
 .../CycloneDX.WebTool.csproj                  |  8 +++----
 src/CycloneDX.WebTool/Pages/Convert.razor     | 19 +++++++++--------
 src/CycloneDX.WebTool/Pages/Merge.razor       | 21 ++++++++++---------
 src/CycloneDX.WebTool/Pages/Validate.razor    | 11 +++++-----
 4 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/CycloneDX.WebTool/CycloneDX.WebTool.csproj b/src/CycloneDX.WebTool/CycloneDX.WebTool.csproj
index fc19e6b..6ccb6de 100644
--- a/src/CycloneDX.WebTool/CycloneDX.WebTool.csproj
+++ b/src/CycloneDX.WebTool/CycloneDX.WebTool.csproj
@@ -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>
diff --git a/src/CycloneDX.WebTool/Pages/Convert.razor b/src/CycloneDX.WebTool/Pages/Convert.razor
index ba8b4f5..927477d 100644
--- a/src/CycloneDX.WebTool/Pages/Convert.razor
+++ b/src/CycloneDX.WebTool/Pages/Convert.razor
@@ -35,7 +35,7 @@
         Input File
         <InputFile id="inputFile" OnChange="@LoadInputFile"></InputFile>
     </label>
-    
+
     <label>
         Input Format
         <select id="inputFormat" @bind="_inputFormat">
@@ -46,7 +46,7 @@
             <option value="spdxjson">SPDX JSON</option>
         </select>
     </label>
-    
+
     <label>
         Output Format
         <select id="outputFormat" @bind="_outputFormat">
@@ -56,11 +56,12 @@
             <option value="spdxjson">SPDX JSON</option>
         </select>
     </label>
-    
+
     <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>
@@ -68,7 +69,7 @@
             <option value="v1_0">v1.0</option>
         </select>
     </label>
-    
+
     <button id="convert" type="button" @onclick="@ConvertBOM" hidden="@(_inputFileContents == null)">Convert & Download</button>
 </form>
 
@@ -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)
     {
@@ -169,7 +170,7 @@
         byte[] output;
 
         bom.SpecVersion = specificationVersion;
-        
+
         if (_outputFormat == "spdxjson")
         {
             var spdxDoc = bom.ToSpdx();
@@ -206,9 +207,9 @@
             var stringOutput = Xml.Serializer.Serialize(bom);
             output = Encoding.UTF8.GetBytes(stringOutput);
         }
-        
+
         var outputBom64 = System.Convert.ToBase64String(output);
-        
+
         var fileExtension = _outputFormat == "spdxjson" ? "spdx.json": _outputFormat;
         await _jsRuntime.InvokeVoidAsync("cdxFileDownload", Path.GetFileNameWithoutExtension(_userInputFilename) + "." + fileExtension, outputBom64);
     }
diff --git a/src/CycloneDX.WebTool/Pages/Merge.razor b/src/CycloneDX.WebTool/Pages/Merge.razor
index d149317..0ee017d 100644
--- a/src/CycloneDX.WebTool/Pages/Merge.razor
+++ b/src/CycloneDX.WebTool/Pages/Merge.razor
@@ -34,7 +34,7 @@
         Input Files
         <InputFile multiple id="inputFiles" OnChange="@LoadInputFiles"></InputFile>
     </label>
-    
+
     <label>
         Input Format
         <select id="inputFormat" @bind="_inputFormat">
@@ -44,7 +44,7 @@
             <option value="bin">Protobuf</option>
         </select>
     </label>
-    
+
     <label>
         Output Format
         <select id="outputFormat" @bind="_outputFormat">
@@ -53,11 +53,12 @@
             <option value="bin">Protobuf</option>
         </select>
     </label>
-    
+
     <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>
@@ -65,7 +66,7 @@
             <option value="v1_0">v1.0</option>
         </select>
     </label>
-    
+
     <button id="merge" type="button" @onclick="@MergeBOM" hidden="@(_inputFileContents == null)">Merge & Download</button>
 </form>
 
@@ -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)
     {
@@ -118,7 +119,7 @@
             var fileContents = _inputFileContents[i];
             var filename = _userInputFilenames[i];
             Models.Bom currentBom = null;
-            
+
             if (_inputFormat == "json" || _inputFormat == "autodetect" && filename.EndsWith(".json"))
             {
                 try
@@ -172,7 +173,7 @@
         }
 
         byte[] output;
-        
+
         mergedBom.SpecVersion = specificationVersion;
 
         if (_outputFormat == "json")
@@ -203,9 +204,9 @@
         {
             output = Encoding.UTF8.GetBytes(Xml.Serializer.Serialize(mergedBom));
         }
-        
+
         var outputBom64 = System.Convert.ToBase64String(output);
-        
+
         await _jsRuntime.InvokeVoidAsync("cdxFileDownload", "merged-bom." + _outputFormat, outputBom64);
     }
 }
diff --git a/src/CycloneDX.WebTool/Pages/Validate.razor b/src/CycloneDX.WebTool/Pages/Validate.razor
index d5a8743..75a09ce 100644
--- a/src/CycloneDX.WebTool/Pages/Validate.razor
+++ b/src/CycloneDX.WebTool/Pages/Validate.razor
@@ -32,7 +32,7 @@
         File
         <InputFile id="inputFile" OnChange="@LoadInputFile"></InputFile>
     </label>
-    
+
     <label>
         Format
         <select id="inputFormat" @bind="_inputFormat">
@@ -41,11 +41,12 @@
             <option value="xml">XML</option>
         </select>
     </label>
-    
+
     <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>
@@ -53,7 +54,7 @@
             <option value="v1_0">v1.0</option>
         </select>
     </label>
-    
+
     <button id="Validate" type="button" @onclick="@ValidateBOM" hidden="@(_inputFileContents == null)">Validate</button>
 </form>
 
@@ -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)

From a4ed00b98ab69df531a8a5fd930226293a9acf58 Mon Sep 17 00:00:00 2001
From: Oleksandr Dmukhovskyi <olexandrbig@gmail.com>
Date: Fri, 16 Aug 2024 17:33:57 +0300
Subject: [PATCH 2/3] fix codestyle

---
 src/CycloneDX.WebTool/Pages/Convert.razor  | 14 +++++++-------
 src/CycloneDX.WebTool/Pages/Merge.razor    | 16 ++++++++--------
 src/CycloneDX.WebTool/Pages/Validate.razor |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/CycloneDX.WebTool/Pages/Convert.razor b/src/CycloneDX.WebTool/Pages/Convert.razor
index 927477d..5da73fe 100644
--- a/src/CycloneDX.WebTool/Pages/Convert.razor
+++ b/src/CycloneDX.WebTool/Pages/Convert.razor
@@ -35,7 +35,7 @@
         Input File
         <InputFile id="inputFile" OnChange="@LoadInputFile"></InputFile>
     </label>
-
+    
     <label>
         Input Format
         <select id="inputFormat" @bind="_inputFormat">
@@ -46,7 +46,7 @@
             <option value="spdxjson">SPDX JSON</option>
         </select>
     </label>
-
+    
     <label>
         Output Format
         <select id="outputFormat" @bind="_outputFormat">
@@ -56,7 +56,7 @@
             <option value="spdxjson">SPDX JSON</option>
         </select>
     </label>
-
+    
     <label>
         Version (ignored for SPDX output)
         <select id="outputVersion" @bind="_outputVersion">
@@ -69,7 +69,7 @@
             <option value="v1_0">v1.0</option>
         </select>
     </label>
-
+    
     <button id="convert" type="button" @onclick="@ConvertBOM" hidden="@(_inputFileContents == null)">Convert & Download</button>
 </form>
 
@@ -170,7 +170,7 @@
         byte[] output;
 
         bom.SpecVersion = specificationVersion;
-
+        
         if (_outputFormat == "spdxjson")
         {
             var spdxDoc = bom.ToSpdx();
@@ -207,9 +207,9 @@
             var stringOutput = Xml.Serializer.Serialize(bom);
             output = Encoding.UTF8.GetBytes(stringOutput);
         }
-
+        
         var outputBom64 = System.Convert.ToBase64String(output);
-
+        
         var fileExtension = _outputFormat == "spdxjson" ? "spdx.json": _outputFormat;
         await _jsRuntime.InvokeVoidAsync("cdxFileDownload", Path.GetFileNameWithoutExtension(_userInputFilename) + "." + fileExtension, outputBom64);
     }
diff --git a/src/CycloneDX.WebTool/Pages/Merge.razor b/src/CycloneDX.WebTool/Pages/Merge.razor
index 0ee017d..821aff9 100644
--- a/src/CycloneDX.WebTool/Pages/Merge.razor
+++ b/src/CycloneDX.WebTool/Pages/Merge.razor
@@ -34,7 +34,7 @@
         Input Files
         <InputFile multiple id="inputFiles" OnChange="@LoadInputFiles"></InputFile>
     </label>
-
+    
     <label>
         Input Format
         <select id="inputFormat" @bind="_inputFormat">
@@ -44,7 +44,7 @@
             <option value="bin">Protobuf</option>
         </select>
     </label>
-
+    
     <label>
         Output Format
         <select id="outputFormat" @bind="_outputFormat">
@@ -53,7 +53,7 @@
             <option value="bin">Protobuf</option>
         </select>
     </label>
-
+    
     <label>
         Version
         <select id="outputVersion" @bind="_outputVersion">
@@ -66,7 +66,7 @@
             <option value="v1_0">v1.0</option>
         </select>
     </label>
-
+    
     <button id="merge" type="button" @onclick="@MergeBOM" hidden="@(_inputFileContents == null)">Merge & Download</button>
 </form>
 
@@ -119,7 +119,7 @@
             var fileContents = _inputFileContents[i];
             var filename = _userInputFilenames[i];
             Models.Bom currentBom = null;
-
+            
             if (_inputFormat == "json" || _inputFormat == "autodetect" && filename.EndsWith(".json"))
             {
                 try
@@ -173,7 +173,7 @@
         }
 
         byte[] output;
-
+        
         mergedBom.SpecVersion = specificationVersion;
 
         if (_outputFormat == "json")
@@ -204,9 +204,9 @@
         {
             output = Encoding.UTF8.GetBytes(Xml.Serializer.Serialize(mergedBom));
         }
-
+        
         var outputBom64 = System.Convert.ToBase64String(output);
-
+        
         await _jsRuntime.InvokeVoidAsync("cdxFileDownload", "merged-bom." + _outputFormat, outputBom64);
     }
 }
diff --git a/src/CycloneDX.WebTool/Pages/Validate.razor b/src/CycloneDX.WebTool/Pages/Validate.razor
index 75a09ce..30919a6 100644
--- a/src/CycloneDX.WebTool/Pages/Validate.razor
+++ b/src/CycloneDX.WebTool/Pages/Validate.razor
@@ -32,7 +32,7 @@
         File
         <InputFile id="inputFile" OnChange="@LoadInputFile"></InputFile>
     </label>
-
+    
     <label>
         Format
         <select id="inputFormat" @bind="_inputFormat">
@@ -41,7 +41,7 @@
             <option value="xml">XML</option>
         </select>
     </label>
-
+    
     <label>
         Version
         <select id="inputVersion" @bind="_inputVersion">
@@ -54,7 +54,7 @@
             <option value="v1_0">v1.0</option>
         </select>
     </label>
-
+    
     <button id="Validate" type="button" @onclick="@ValidateBOM" hidden="@(_inputFileContents == null)">Validate</button>
 </form>
 

From ca9f6efc4bce0d698800133313f631c16093f4ad Mon Sep 17 00:00:00 2001
From: Oleksandr Dmukhovskyi <olexandrbig@gmail.com>
Date: Fri, 16 Aug 2024 17:41:26 +0300
Subject: [PATCH 3/3] bump version

---
 semver.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/semver.txt b/semver.txt
index a918a2a..faef31a 100644
--- a/semver.txt
+++ b/semver.txt
@@ -1 +1 @@
-0.6.0
+0.7.0