Skip to content

Commit 1012cfd

Browse files
philasmarphilasmar
authored
remove InternalsVisibleTo for S3 integration tests (#4194)
1 parent 7f64813 commit 1012cfd

File tree

6 files changed

+11
-76
lines changed

6 files changed

+11
-76
lines changed

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -92,32 +92,12 @@ public override string TransformText()
9292

9393
#line default
9494
#line hidden
95-
this.Write("[assembly: InternalsVisibleTo(\"AWSSDK.UnitTests.S3.NetFramework, PublicKey=002400" +
96-
"0004800000940000000602000000240000525341310004000001000100db5f59f098d27276c78338" +
97-
"75a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa7" +
98-
"6adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a4799" +
99-
"67c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n[" +
100-
"assembly: InternalsVisibleTo(\"AWSSDK.UnitTests.NetFramework, PublicKey=002400000" +
101-
"4800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a" +
102-
"6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76ad" +
103-
"c811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c" +
104-
"3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n\r\n//" +
105-
" We should remove this in the future when TransferUtility Upload/Download direct" +
106-
"ory methods return responses.\r\n// We should update the Integration Tests in Tran" +
107-
"sferUtilityTests.cs to not use the internal methods and instead use the new publ" +
108-
"ic ones that return responses.\r\n[assembly: InternalsVisibleTo(\"AWSSDK.Integratio" +
109-
"nTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341" +
110-
"310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745" +
111-
"db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba89" +
112-
"1f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28" +
113-
"f3a0752a81203f03ccb7f684db373518b4\")]\r\n[assembly: InternalsVisibleTo(\"DynamicPro" +
114-
"xyGenAssembly2, PublicKey=002400000480000094000000060200000024000052534131000400" +
115-
"0001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734a" +
116-
"a39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64" +
117-
"bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be" +
118-
"11e6a7d3113e92484cf7045cc7\")]\r\n");
119-
120-
#line 37 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
95+
this.Write(@"[assembly: InternalsVisibleTo(""AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4"")]
96+
[assembly: InternalsVisibleTo(""AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4"")]
97+
[assembly: InternalsVisibleTo(""DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7"")]
98+
");
99+
100+
#line 33 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
121101
}
122102

123103
#line default
@@ -146,14 +126,14 @@ public override string TransformText()
146126
// [assembly: AssemblyVersion(""1.0.*"")]
147127
[assembly: AssemblyVersion(""");
148128

149-
#line 60 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
129+
#line 56 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
150130
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceVersion));
151131

152132
#line default
153133
#line hidden
154134
this.Write("\")]\r\n[assembly: AssemblyFileVersion(\"");
155135

156-
#line 61 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
136+
#line 57 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
157137
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceFileVersion));
158138

159139
#line default

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ using System.Runtime.CompilerServices;
2929
<# if (this.Config.AssemblyTitle=="AWSSDK.S3") { #>
3030
[assembly: InternalsVisibleTo("AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
3131
[assembly: InternalsVisibleTo("AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
32-
33-
// We should remove this in the future when TransferUtility Upload/Download directory methods return responses.
34-
// We should update the Integration Tests in TransferUtilityTests.cs to not use the internal methods and instead use the new public ones that return responses.
35-
[assembly: InternalsVisibleTo("AWSSDK.IntegrationTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
3632
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
3733
<# } #>
3834
[assembly: AssemblyConfiguration("")]

‎sdk/src/Services/S3/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121

2222
[assembly: InternalsVisibleTo("AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
2323
[assembly: InternalsVisibleTo("AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
24-
25-
// We should remove this in the future when TransferUtility Upload/Download directory methods return responses.
26-
// We should update the Integration Tests in TransferUtilityTests.cs to not use the internal methods and instead use the new public ones that return responses.
27-
[assembly: InternalsVisibleTo("AWSSDK.IntegrationTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
2824
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
2925
[assembly: AssemblyConfiguration("")]
3026
[assembly: AssemblyProduct("Amazon Web Services SDK for .NET")]

‎sdk/test/IntegrationTests/AWSSDK.IntegrationTestUtilities.NetFramework.csproj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,9 @@
1616
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1717
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1818
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
19-
<SignAssembly>true</SignAssembly>
2019
<NoWarn>CS1591,CS0612,CS0618</NoWarn>
2120
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2221
</PropertyGroup>
23-
24-
<Choose>
25-
<When Condition=" '$(AWSKeyFile)' == '' ">
26-
<PropertyGroup>
27-
<AssemblyOriginatorKeyFile>../../awssdk.dll.snk</AssemblyOriginatorKeyFile>
28-
</PropertyGroup>
29-
</When>
30-
<Otherwise>
31-
<PropertyGroup>
32-
<AssemblyOriginatorKeyFile>$(AWSKeyFile)</AssemblyOriginatorKeyFile>
33-
</PropertyGroup>
34-
</Otherwise>
35-
</Choose>
3622

3723
<ItemGroup>
3824
<Compile Remove="**/**" />

‎sdk/test/Services/S3/IntegrationTests/AWSSDK.IntegrationTests.S3.NetFramework.csproj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,9 @@
1616
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1717
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1818
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
19-
<SignAssembly>true</SignAssembly>
2019
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2120
<NoWarn>CS1591,CS0612,CS0618</NoWarn>
2221
</PropertyGroup>
23-
24-
<Choose>
25-
<When Condition=" '$(AWSKeyFile)' == '' ">
26-
<PropertyGroup>
27-
<AssemblyOriginatorKeyFile>../../../../awssdk.dll.snk</AssemblyOriginatorKeyFile>
28-
</PropertyGroup>
29-
</When>
30-
<Otherwise>
31-
<PropertyGroup>
32-
<AssemblyOriginatorKeyFile>$(AWSKeyFile)</AssemblyOriginatorKeyFile>
33-
</PropertyGroup>
34-
</Otherwise>
35-
</Choose>
3622

3723
<ItemGroup>
3824

‎sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2594,10 +2594,7 @@ public async Task UploadDirectoryFailurePolicy_ContinueOnFailure_AllFailures()
25942594
};
25952595

25962596
// ContinueOnFailure should not throw even if all uploads fail
2597-
var config = new TransferUtilityConfig();
2598-
var command = new Amazon.S3.Transfer.Internal.UploadDirectoryCommand(transferUtility, config, request);
2599-
command.UploadFilesConcurrently = request.UploadFilesConcurrently;
2600-
var response = await command.ExecuteAsync(CancellationToken.None).ConfigureAwait(false);
2597+
var response = await transferUtility.UploadDirectoryWithResponseAsync(request);
26012598

26022599
Assert.IsNotNull(response);
26032600
Assert.AreEqual(0, response.ObjectsUploaded);
@@ -2631,10 +2628,7 @@ public async Task UploadDirectoryFailurePolicy_ContinueOnFailure_AllSuccess()
26312628
UploadFilesConcurrently = true
26322629
};
26332630

2634-
var config = new TransferUtilityConfig();
2635-
var command = new Amazon.S3.Transfer.Internal.UploadDirectoryCommand(transferUtility, config, request);
2636-
command.UploadFilesConcurrently = request.UploadFilesConcurrently;
2637-
var response = await command.ExecuteAsync(CancellationToken.None).ConfigureAwait(false);
2631+
var response = await transferUtility.UploadDirectoryWithResponseAsync(request);
26382632

26392633
Assert.IsNotNull(response);
26402634
Assert.AreEqual(3, response.ObjectsUploaded);
@@ -2672,10 +2666,7 @@ public async Task UploadDirectoryFailurePolicy_AbortOnFailure_Throws()
26722666
UploadFilesConcurrently = true
26732667
};
26742668

2675-
var config = new TransferUtilityConfig();
2676-
var command = new Amazon.S3.Transfer.Internal.UploadDirectoryCommand(transferUtility, config, request);
2677-
command.UploadFilesConcurrently = request.UploadFilesConcurrently;
2678-
await Assert.ThrowsExceptionAsync<AmazonS3Exception>(() => command.ExecuteAsync(CancellationToken.None));
2669+
await Assert.ThrowsExceptionAsync<AmazonS3Exception>(() => transferUtility.UploadDirectoryWithResponseAsync(request));
26792670
}
26802671
}
26812672
finally

0 commit comments

Comments
 (0)