Skip to content

Commit 630f2ba

Browse files
Merge branch 'feature/V4-AWSLogin' into v4.1
2 parents d3f2658 + 9537ca4 commit 630f2ba

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

buildtools/build.proj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@
240240
<Copy SourceFiles="$(RootPath)/CHANGELOG.md" DestinationFiles="$(NetCoreDeploymentArtifacts)/CHANGELOG.txt"/>
241241
<Copy SourceFiles="$(RootPath)/LICENSE" DestinationFiles="$(NetCoreDeploymentArtifacts)/LICENSE"/>
242242
<Copy SourceFiles="$(RootPath)/NOTICE" DestinationFiles="$(NetCoreDeploymentArtifacts)/NOTICE"/>
243+
244+
<!-- Copy transitive dependencies -->
245+
<Copy SourceFiles="$(SDKAssembliesFolder)/netstandard2.0/BouncyCastle.Cryptography.dll" DestinationFolder="$(NetCoreDeploymentArtifacts)"/>
243246
</Target>
244247

245248
<Target Name="copy-modular-artifacts" DependsOnTargets="build-modular-modules">

generator/AWSPSGeneratorLib/Writers/SourceCode/CopyModularArtifactsScriptTemplate.razor

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ $assembliesFolder = "$rootFolder/Include/sdk/assemblies"
2222
$moduleFilesSuffixes = @@('.Completers.psm1', '.Aliases.psm1', '.psd1')
2323
$binFilesSuffixes = @@('.dll', '.XML', '.dll-Help.xml', '.Format.ps1xml')
2424

25+
$transitiveDependencies = @@('BouncyCastle.Cryptography.dll')
26+
27+
$serviceTransitiveDependencies = @@{
28+
Signin = @@('BouncyCastle.Cryptography.dll')
29+
}
30+
2531
If (Test-Path $modularDeploymentFolder)
2632
{
2733
Remove-Item -Path $modularDeploymentFolder -Recurse
@@ -45,6 +51,9 @@ foreach ($suffix in $binFilesSuffixes)
4551
{
4652
Copy-Item -Path "$commonModuleFolder/$releaseBitPath/AWS.Tools.Common$suffix" -Destination "$modularDeploymentFolder/AWS.Tools.Common/AWS.Tools.Common$suffix"
4753
}
54+
foreach($transitiveDependency in $transitiveDependencies){
55+
Copy-Item -Path "$assembliesFolder/netstandard2.0/$transitiveDependency" -Destination "$modularDeploymentFolder/AWS.Tools.Common/"
56+
}
4857
Copy-Item -Path "$commonModuleFolder/$releaseBitPath/AWSSDK.Core.dll" -Destination "$modularDeploymentFolder/AWS.Tools.Common/AWSSDK.Core.dll"
4958
Copy-Item -Path "$commonModuleFolder/$releaseBitPath/AWSSDK.SecurityToken.dll" -Destination "$modularDeploymentFolder/AWS.Tools.Common/AWSSDK.SecurityToken.dll"
5059
Copy-Item -Path "$commonModuleFolder/$releaseBitPath/AWSSDK.SSOOIDC.dll" -Destination "$modularDeploymentFolder/AWS.Tools.Common/AWSSDK.SSOOIDC.dll"
@@ -55,6 +64,7 @@ Copy-Item -Path "$assembliesFolder/netstandard2.0/aws-crt-auth.dll" -Destination
5564
Copy-Item -Path "$assembliesFolder/netstandard2.0/aws-crt-http.dll" -Destination "$modularDeploymentFolder/AWS.Tools.Common/aws-crt-http.dll"
5665
Copy-Item -Path "$assembliesFolder/netstandard2.0/aws-crt-checksums.dll" -Destination "$modularDeploymentFolder/AWS.Tools.Common/aws-crt-checksums.dll"
5766
Copy-Item -Path "$assembliesFolder/netstandard2.0/AWSSDK.Extensions.CrtIntegration.dll" -Destination "$modularDeploymentFolder/AWS.Tools.Common/AWSSDK.Extensions.CrtIntegration.dll"
67+
Copy-Item -Path "$assembliesFolder/netstandard2.0/AWSSDK.Signin.dll" -Destination "$modularDeploymentFolder/AWS.Tools.Common/AWSSDK.Signin.dll"
5868
Copy-Item -Path "$rootFolder/LICENSE" -Destination "$modularDeploymentFolder/AWS.Tools.Common/LICENSE"
5969
Copy-Item -Path "$rootFolder/NOTICE" -Destination "$modularDeploymentFolder/AWS.Tools.Common/NOTICE"
6070

@@ -86,6 +96,20 @@ foreach ($project in $projectNameList)
8696
Copy-Item -Path "$projectFolder/$releaseBitPath/AWSSDK.$project.dll" -Destination "$projectDeploymentFolder/AWSSDK.$project.dll"
8797
}
8898

99+
if ($serviceTransitiveDependencies -ne $null -and $serviceTransitiveDependencies.ContainsKey($project))
100+
{
101+
if ($serviceTransitiveDependencies[$project] -ne $null)
102+
{
103+
foreach ($transitiveDependency in $serviceTransitiveDependencies[$project])
104+
{
105+
if (Test-Path -Path "$assembliesFolder/netstandard2.0/$transitiveDependency" -PathType Leaf)
106+
{
107+
Copy-Item -Path "$assembliesFolder/netstandard2.0/$transitiveDependency" -Destination "$projectDeploymentFolder/"
108+
}
109+
}
110+
}
111+
}
112+
89113
Copy-Item -Path "$rootFolder/LICENSE" -Destination "$projectDeploymentFolder/LICENSE"
90114
Copy-Item -Path "$rootFolder/NOTICE" -Destination "$projectDeploymentFolder/NOTICE"
91115
}

0 commit comments

Comments
 (0)