Updated target to BeforeCodesign and removed non-existent parameters …

…for swift-stdlib-tool (#1431)
xamarin · Oct 19, 2023 · 7ed4611 · 7ed4611
1 parent 4374761
commit 7ed4611
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/iOS/SwiftRuntimeSupport/build.cake b/iOS/SwiftRuntimeSupport/build.cake
@@ -3,7 +3,7 @@
 
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var SWIFT_RUNTIME_SUPPORT_VERSION = "0.2.1";
+var SWIFT_RUNTIME_SUPPORT_VERSION = "0.2.2";
 var SWIFT_RUNTIME_SUPPORT_NUGET_VERSION = SWIFT_RUNTIME_SUPPORT_VERSION;
 
 Task ("externals")

diff --git a/iOS/SwiftRuntimeSupport/source/SwiftRuntimeSupport.csproj b/iOS/SwiftRuntimeSupport/source/SwiftRuntimeSupport.csproj
@@ -18,7 +18,7 @@
  <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2092210</PackageProjectUrl>
  <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
- <PackageVersion>0.2.1</PackageVersion>
+ <PackageVersion>0.2.2</PackageVersion>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/iOS/SwiftRuntimeSupport/source/SwiftRuntimeSupport.targets b/iOS/SwiftRuntimeSupport/source/SwiftRuntimeSupport.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <_SRSMasterAfterTargets>_CodesignNativeLibraries</_SRSMasterAfterTargets>
+ <PropertyGroup>
+ <_SRSMasterAfterTargets>BeforeCodesign</_SRSMasterAfterTargets>
  <_SRSMasterDependsOnTargets>_SRSCopySwiftDependencies</_SRSMasterDependsOnTargets>
  <_XcodeToolChainRelativeToSdkRoot>/../../../../../Toolchains/XcodeDefault.xctoolchain/</_XcodeToolChainRelativeToSdkRoot>
  <_TargetPlatform Condition=" '$(Platform)' == 'iPhoneSimulator' ">iphonesimulator</_TargetPlatform>
@@ -14,14 +14,14 @@
  <_SRSRemoteMirror Condition=" '$(Configuration)' != 'Debug' "></_SRSRemoteMirror>
  <_SRSRemoteMirror Condition=" '$(Configuration)' == 'Debug' ">--resource-destination '$(_AppBundlePath)' --resource-library libswiftRemoteMirror.dylib</_SRSRemoteMirror>
  </PropertyGroup>
- 
+
  <Message Text="Copying Swift Frameworks dependencies for $(_NativeExecutable) to the $(_AppBundlePath)Frameworks folder." />
- <Exec Condition="'$(_CodeSigningKey)' != ''" SessionId="$(BuildSessionId)" Command="$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/bin/swift-stdlib-tool --copy --verbose --sign '$(_CodeSigningKey)' --scan-executable '$(_NativeExecutable)' --scan-folder '$(_AppBundlePath)Frameworks/' --scan-folder '$(_AppBundlePath)PlugIns/' --platform '$(_TargetPlatform)' --toolchain '$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)' --destination '$(_AppBundlePath)Frameworks/' $(_SRSRemoteMirror) --unsigned-destination '$(DeviceSpecificIntermediateOutputPath)SwiftSupport' --strip-bitcode --strip-bitcode-tool '$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/bin/bitcode_strip' --emit-dependency-info '$(DeviceSpecificIntermediateOutputPath)SwiftStdLibToolInputDependencies.dep' --source-libraries '$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/lib/swift-5.5/$(_TargetPlatform)'" />
- <Exec Condition="'$(_CodeSigningKey)' == ''" SessionId="$(BuildSessionId)" Command="$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/bin/swift-stdlib-tool --copy --verbose --scan-executable '$(_NativeExecutable)' --scan-folder '$(_AppBundlePath)Frameworks/' --scan-folder '$(_AppBundlePath)PlugIns/' --platform '$(_TargetPlatform)' --toolchain '$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)' --destination '$(_AppBundlePath)Frameworks/' $(_SRSRemoteMirror) --unsigned-destination '$(DeviceSpecificIntermediateOutputPath)SwiftSupport' --strip-bitcode --strip-bitcode-tool '$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/bin/bitcode_strip' --emit-dependency-info '$(DeviceSpecificIntermediateOutputPath)SwiftStdLibToolInputDependencies.dep' --source-libraries '$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/lib/swift-5.5/$(_TargetPlatform)'" />
+ <Exec Condition="'$(_CodeSigningKey)' != ''" SessionId="$(BuildSessionId)" Command="$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/bin/swift-stdlib-tool --copy --verbose --sign '$(_CodeSigningKey)' --scan-executable '$(_NativeExecutable)' --scan-folder '$(_AppBundlePath)Frameworks/' --scan-folder '$(_AppBundlePath)PlugIns/' --platform '$(_TargetPlatform)' --destination '$(_AppBundlePath)Frameworks/' $(_SRSRemoteMirror) --unsigned-destination '$(DeviceSpecificIntermediateOutputPath)SwiftSupport' --strip-bitcode --source-libraries '$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/lib/swift-5.5/$(_TargetPlatform)'" />
+ <Exec Condition="'$(_CodeSigningKey)' == ''" SessionId="$(BuildSessionId)" Command="$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/bin/swift-stdlib-tool --copy --verbose --scan-executable '$(_NativeExecutable)' --scan-folder '$(_AppBundlePath)Frameworks/' --scan-folder '$(_AppBundlePath)PlugIns/' --platform '$(_TargetPlatform)' --destination '$(_AppBundlePath)Frameworks/' $(_SRSRemoteMirror) --unsigned-destination '$(DeviceSpecificIntermediateOutputPath)SwiftSupport' --strip-bitcode --source-libraries '$(_SdkRoot)$(_XcodeToolChainRelativeToSdkRoot)usr/lib/swift-5.5/$(_TargetPlatform)'" />
  </Target>
- 
+
  <Target Name="_SRSCopySwiftSupport" Condition="'$(ArchiveOnBuild)'=='true'" AfterTargets="Archive">
  <Message Text="Copying SwiftSupport folder from $(DeviceSpecificIntermediateOutputPath)SwiftSupport to $(ArchiveDir)/SwiftSupport folder." />
  <Ditto SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" ToolExe="$(DittoExe)" ToolPath="$(DittoPath)" Source="$(DeviceSpecificIntermediateOutputPath)SwiftSupport" Destination="$(ArchiveDir)/SwiftSupport" />
  </Target>
-</Project>
+</Project>