@@ -703,14 +703,14 @@ def FSharpInstallDir(self) -> str:
703
703
return self .ri .lookup (path , 'productdir' ) or ''
704
704
705
705
@property
706
- def UniversalCRTSdkDir (self ) -> str :
706
+ def UniversalCRTSdkDir (self ) -> str | None :
707
707
"""
708
708
Microsoft Universal CRT SDK directory.
709
709
710
710
Return
711
711
------
712
712
str
713
- path
713
+ path | None
714
714
"""
715
715
# Set Kit Roots versions for specified MSVC++ version
716
716
vers = ('10' , '81' ) if self .vs_ver >= 14.0 else ()
@@ -721,10 +721,10 @@ def UniversalCRTSdkDir(self) -> str:
721
721
if sdkdir :
722
722
return sdkdir
723
723
724
- return ''
724
+ return None
725
725
726
726
@property
727
- def UniversalCRTSdkLastVersion (self ):
727
+ def UniversalCRTSdkLastVersion (self ) -> str :
728
728
"""
729
729
Microsoft Universal C Runtime SDK last version.
730
730
@@ -733,7 +733,9 @@ def UniversalCRTSdkLastVersion(self):
733
733
str
734
734
version
735
735
"""
736
- return self ._use_last_dir_name (os .path .join (self .UniversalCRTSdkDir , 'lib' ))
736
+ return self ._use_last_dir_name (
737
+ os .path .join (self .UniversalCRTSdkDir or '' , 'lib' )
738
+ )
737
739
738
740
@property
739
741
def NetFxSdkVersion (self ):
@@ -1345,7 +1347,7 @@ def HTMLHelpWorkshop(self):
1345
1347
return [os .path .join (self .si .ProgramFilesx86 , 'HTML Help Workshop' )]
1346
1348
1347
1349
@property
1348
- def UCRTLibraries (self ):
1350
+ def UCRTLibraries (self ) -> list [ str ] :
1349
1351
"""
1350
1352
Microsoft Universal C Runtime SDK Libraries.
1351
1353
@@ -1358,12 +1360,12 @@ def UCRTLibraries(self):
1358
1360
return []
1359
1361
1360
1362
arch_subdir = self .pi .target_dir (x64 = True )
1361
- lib = os .path .join (self .si .UniversalCRTSdkDir , 'lib' )
1363
+ lib = os .path .join (self .si .UniversalCRTSdkDir or '' , 'lib' )
1362
1364
ucrtver = self ._ucrt_subdir
1363
1365
return [os .path .join (lib , f'{ ucrtver } ucrt{ arch_subdir } ' )]
1364
1366
1365
1367
@property
1366
- def UCRTIncludes (self ):
1368
+ def UCRTIncludes (self ) -> list [ str ] :
1367
1369
"""
1368
1370
Microsoft Universal C Runtime SDK Include.
1369
1371
@@ -1375,7 +1377,7 @@ def UCRTIncludes(self):
1375
1377
if self .vs_ver < 14.0 :
1376
1378
return []
1377
1379
1378
- include = os .path .join (self .si .UniversalCRTSdkDir , 'include' )
1380
+ include = os .path .join (self .si .UniversalCRTSdkDir or '' , 'include' )
1379
1381
return [os .path .join (include , f'{ self ._ucrt_subdir } ucrt' )]
1380
1382
1381
1383
@property
0 commit comments