Merge branch 'develop' into devsecops

aleks-ivanov · Dec 11, 2023 · 40b08ec · 40b08ec
2 parents ad7975d + 38227bc
commit 40b08ec
Show file tree

Hide file tree

Showing 37 changed files with 1,182 additions and 1 deletion.
diff --git a/iTextCore.sln b/iTextCore.sln
@@ -57,6 +57,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.bouncy-castle-fips-ad
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.bouncy-castle-connector.netstandard", "itext\itext.bouncy-castle-connector\itext.bouncy-castle-connector.csproj", "{C68E3329-A2E4-4B33-BADE-0521B8E832AD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.pdfua", "itext\itext.pdfua\itext.pdfua.csproj", "{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.pdfua.tests", "itext.tests\itext.pdfua.tests\itext.pdfua.tests.csproj", "{5580E076-BD41-47D6-B241-513E7B76C426}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -391,6 +395,30 @@ Global
 		{C68E3329-A2E4-4B33-BADE-0521B8E832AD}.Release|x64.Build.0 = Release|Any CPU
 		{C68E3329-A2E4-4B33-BADE-0521B8E832AD}.Release|x86.ActiveCfg = Release|Any CPU
 		{C68E3329-A2E4-4B33-BADE-0521B8E832AD}.Release|x86.Build.0 = Release|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Debug|x64.Build.0 = Debug|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Debug|x86.Build.0 = Debug|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Release|x64.ActiveCfg = Release|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Release|x64.Build.0 = Release|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Release|x86.ActiveCfg = Release|Any CPU
+		{9E785EC2-E32B-4C02-AFB4-84F99C587DEF}.Release|x86.Build.0 = Release|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Debug|x64.Build.0 = Debug|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Debug|x86.Build.0 = Debug|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Release|x64.ActiveCfg = Release|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Release|x64.Build.0 = Release|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Release|x86.ActiveCfg = Release|Any CPU
+		{5580E076-BD41-47D6-B241-513E7B76C426}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/itext.nuspec b/itext.nuspec
@@ -50,6 +50,8 @@
     <file src="itext\itext.layout\bin\Release\net461\itext.layout.xml" target="lib\net461" />
     <file src="itext\itext.pdfa\bin\Release\net461\itext.pdfa.dll" target="lib\net461" />
     <file src="itext\itext.pdfa\bin\Release\net461\itext.pdfa.xml" target="lib\net461" />
+    <file src="itext\itext.pdfua\bin\Release\net461\itext.pdfua.dll" target="lib\net461" />
+    <file src="itext\itext.pdfua\bin\Release\net461\itext.pdfua.xml" target="lib\net461" />
     <file src="itext\itext.forms\bin\Release\net461\itext.forms.dll" target="lib\net461" />
     <file src="itext\itext.forms\bin\Release\net461\itext.forms.xml" target="lib\net461" />
     <file src="itext\itext.barcodes\bin\Release\net461\itext.barcodes.dll" target="lib\net461" />
@@ -70,6 +72,8 @@
     <file src="itext\itext.layout\bin\Release\netstandard2.0\itext.layout.xml" target="lib\netstandard2.0" />
     <file src="itext\itext.pdfa\bin\Release\netstandard2.0\itext.pdfa.dll" target="lib\netstandard2.0" />
     <file src="itext\itext.pdfa\bin\Release\netstandard2.0\itext.pdfa.xml" target="lib\netstandard2.0" />
+    <file src="itext\itext.pdfua\bin\Release\netstandard2.0\itext.pdfua.dll" target="lib\netstandard2.0" />
+    <file src="itext\itext.pdfua\bin\Release\netstandard2.0\itext.pdfua.xml" target="lib\netstandard2.0" />
     <file src="itext\itext.forms\bin\Release\netstandard2.0\itext.forms.dll" target="lib\netstandard2.0" />
     <file src="itext\itext.forms\bin\Release\netstandard2.0\itext.forms.xml" target="lib\netstandard2.0" />
     <file src="itext\itext.barcodes\bin\Release\netstandard2.0\itext.barcodes.dll" target="lib\netstandard2.0" />