Resolve Concelier/Excititor merge conflicts
This commit is contained in:
		
							
								
								
									
										28
									
								
								samples/scanner/images/dotnet-aot/usage.cdx.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								samples/scanner/images/dotnet-aot/usage.cdx.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,28 @@
 | 
			
		||||
{
 | 
			
		||||
  "bomFormat": "CycloneDX",
 | 
			
		||||
  "specVersion": "1.5",
 | 
			
		||||
  "version": 1,
 | 
			
		||||
  "metadata": {
 | 
			
		||||
    "timestamp": "2025-10-19T00:00:00Z",
 | 
			
		||||
    "component": {
 | 
			
		||||
      "type": "container",
 | 
			
		||||
      "name": "dotnet-aot",
 | 
			
		||||
      "version": "8.0.0",
 | 
			
		||||
      "bomRef": "pkg:docker/stellaops/sample-dotnet-aot@sha256:5be6f3ad9d2b1e4fcb4c6f40d9c664fca97f5b4d9ccb8e1d8f970e8b2bce1123"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "components": [
 | 
			
		||||
    {
 | 
			
		||||
      "type": "application",
 | 
			
		||||
      "bomRef": "pkg:nuget/Sample.Worker@1.0.0",
 | 
			
		||||
      "name": "Sample.Worker",
 | 
			
		||||
      "version": "1.0.0"
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
      "type": "library",
 | 
			
		||||
      "bomRef": "pkg:nuget/System.Text.Json@8.0.0",
 | 
			
		||||
      "name": "System.Text.Json",
 | 
			
		||||
      "version": "8.0.0"
 | 
			
		||||
    }
 | 
			
		||||
  ]
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user