ScriptCollection 4.2.97__py3-none-any.whl → 4.2.99__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ScriptCollection/ScriptCollectionCore.py +1 -1
- ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py +5 -8
- {scriptcollection-4.2.97.dist-info → scriptcollection-4.2.99.dist-info}/METADATA +1 -1
- {scriptcollection-4.2.97.dist-info → scriptcollection-4.2.99.dist-info}/RECORD +7 -7
- {scriptcollection-4.2.97.dist-info → scriptcollection-4.2.99.dist-info}/WHEEL +0 -0
- {scriptcollection-4.2.97.dist-info → scriptcollection-4.2.99.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.2.97.dist-info → scriptcollection-4.2.99.dist-info}/top_level.txt +0 -0
|
@@ -161,10 +161,7 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
161
161
|
GeneralUtilities.ensure_directory_does_not_exist(outputfolder)
|
|
162
162
|
self._protected_sc.run_program("dotnet", "clean", csproj_file_folder)
|
|
163
163
|
GeneralUtilities.ensure_directory_exists(outputfolder)
|
|
164
|
-
|
|
165
|
-
if os.path.isfile(os.path.join(codeunit_folder, "NuGet.config")):
|
|
166
|
-
restore_args += ["--configfile", "NuGet.config"]
|
|
167
|
-
self._protected_sc.run_program_argsasarray("dotnet", restore_args, codeunit_folder,print_live_output=self.get_verbosity()==LogLevel.Debug)
|
|
164
|
+
self._protected_sc.run_program_argsasarray("dotnet", ["restore", "--runtime", runtime], codeunit_folder,print_live_output=self.get_verbosity()==LogLevel.Debug)
|
|
168
165
|
self._protected_sc.run_program_argsasarray("dotnet", ["build", "--no-restore", csproj_file_name, "-c", dotnet_build_configuration, "-o", outputfolder, "--runtime", runtime], csproj_file_folder,print_live_output=self.get_verbosity()==LogLevel.Debug)
|
|
169
166
|
if copy_license_file_to_target_folder:
|
|
170
167
|
license_file = os.path.join(repository_folder, "License.txt")
|
|
@@ -255,12 +252,12 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
255
252
|
def generate_sbom_for_dotnet_project(self, codeunit_folder: str) -> None:
|
|
256
253
|
self._protected_sc.log.log("Generate SBOM...")
|
|
257
254
|
codeunit_name = os.path.basename(codeunit_folder)
|
|
258
|
-
bomfile_folder = "Other
|
|
259
|
-
self._protected_sc.run_program_argsasarray("dotnet", ["CycloneDX", f"{codeunit_name}
|
|
255
|
+
bomfile_folder = "Other/Artifacts/BOM"
|
|
256
|
+
self._protected_sc.run_program_argsasarray("dotnet", ["CycloneDX", f"{codeunit_name}/{codeunit_name}.csproj", "-o", bomfile_folder], codeunit_folder)
|
|
260
257
|
codeunitversion = self.tfcps_Tools_General.get_version_of_codeunit(os.path.join(codeunit_folder, f"{codeunit_name}.codeunit.xml"))
|
|
261
|
-
target = f"{codeunit_folder}
|
|
258
|
+
target = f"{codeunit_folder}/{bomfile_folder}/{codeunit_name}.{codeunitversion}.sbom.xml"
|
|
262
259
|
GeneralUtilities.ensure_file_does_not_exist(target)
|
|
263
|
-
os.rename(f"{codeunit_folder}
|
|
260
|
+
os.rename(f"{codeunit_folder}/{bomfile_folder}/bom.xml", target)
|
|
264
261
|
self._protected_sc.format_xml_file(target)
|
|
265
262
|
|
|
266
263
|
@GeneralUtilities.check_arguments
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.2.
|
|
3
|
+
Version: 4.2.99
|
|
4
4
|
Summary: The ScriptCollection is the place for reusable scripts.
|
|
5
5
|
Author-email: Marius Göcke <marius.goecke@gmail.com>
|
|
6
6
|
Project-URL: Homepage, https://github.com/anionDev/ScriptCollection
|
|
@@ -15,7 +15,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
|
|
|
15
15
|
ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
|
|
16
16
|
ScriptCollection/ProgramRunnerSudo.py,sha256=_khC3xuTdrPoLluBJZWfldltmmuKltABJPcbjZSFW-4,4835
|
|
17
17
|
ScriptCollection/SCLog.py,sha256=8TRy1LeYMsPOIuWUcnUNNbO5pd-cNBS-3cn-kdzP8FU,4768
|
|
18
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
18
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=m3suxQcvrixLKAs01D1xLv0Ke7YOxDPtIHUW1wsXzIo,188596
|
|
19
19
|
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
20
20
|
ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=o129UYDtLymCRjMZBP9Puaj19ueMHoNt6UTLspfnaRc,1758
|
|
21
21
|
ScriptCollection/OCIImages/OCIImageManager.py,sha256=2muW4hJ_a7EfavY3WVnafqZ0HC87RcZsoTuNvA3c0To,11175
|
|
@@ -45,7 +45,7 @@ ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
|
|
|
45
45
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationBase.py,sha256=bT6Gd5pQpZCw4OQz6HWkPCSn5z__eUUEisABLDSxd0o,200
|
|
46
46
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationGenerate.py,sha256=QyjOfMY22JWCvKjMelHiDWbJiWqotOfebpJpgDUaoO4,237
|
|
47
47
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationNoGenerate.py,sha256=i0zEGehj0sttxjjZtoq2KFSKp_ulxVyWp_ZgAhIY_So,241
|
|
48
|
-
ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=
|
|
48
|
+
ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=Wa1NK39CeHSmaMD8w1MFEkfoo-5ssZAE3PDeYkvrakM,40316
|
|
49
49
|
ScriptCollection/TFCPS/DotNet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
50
50
|
ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=KAjyFyEjpkghsVPskfsHD68k4Z92gRCT_q6BXfikRwE,7660
|
|
51
51
|
ScriptCollection/TFCPS/Flutter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -291,8 +291,8 @@ build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Python/TFCPS_Code
|
|
|
291
291
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
292
292
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=WhOsMpJxNGqnQGA3nJ99ruyqymxBeJxCcpK98zJduTo,1680
|
|
293
293
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
294
|
-
scriptcollection-4.2.
|
|
295
|
-
scriptcollection-4.2.
|
|
296
|
-
scriptcollection-4.2.
|
|
297
|
-
scriptcollection-4.2.
|
|
298
|
-
scriptcollection-4.2.
|
|
294
|
+
scriptcollection-4.2.99.dist-info/METADATA,sha256=Prvlu0BJ2UUBSkXD92N-4E6oGyBGxmE6UzWY3drQ5z8,7696
|
|
295
|
+
scriptcollection-4.2.99.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
|
|
296
|
+
scriptcollection-4.2.99.dist-info/entry_points.txt,sha256=ORHAH5j1XQaNqsrloSe9PNEf-vFfLiOjFZBf5Q-02Cs,4808
|
|
297
|
+
scriptcollection-4.2.99.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
298
|
+
scriptcollection-4.2.99.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|