Skip to content

Commit 3b49adf

Browse files
jviaujviau
authored
Update Tests.Shared from shproj to csproj (#11187)
1 parent 7a99775 commit 3b49adf

File tree

14 files changed

+36
-88
lines changed

14 files changed

+36
-88
lines changed

‎WebJobs.Script.sln‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{AFB0F5F7-A
2222
EndProject
2323
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Tests", "test\WebJobs.Script.Tests\WebJobs.Script.Tests.csproj", "{3BA93614-3A4A-49B0-BFBC-7831E2C02BB7}"
2424
EndProject
25-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WebJobs.Script.Tests.Shared", "test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.shproj", "{35C9CCB7-D8B6-4161-BB0D-BCFA7C6DCFFB}"
26-
EndProject
2725
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Tests.Integration", "test\WebJobs.Script.Tests.Integration\WebJobs.Script.Tests.Integration.csproj", "{EDDDAED1-0E37-4ED7-A595-63F686DEE90A}"
2826
EndProject
2927
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Grpc", "src\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj", "{38920568-003E-448F-963B-41B739D1E01C}"
@@ -65,6 +63,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFunctions", "test\Resou
6563
EndProject
6664
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobsStartupTests", "test\Resources\TestProjects\WebJobsStartupTests\WebJobsStartupTests.csproj", "{3746E49F-DD26-4CBD-B961-0ADF6EA84909}"
6765
EndProject
66+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobs.Script.Tests.Shared", "test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.csproj", "{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}"
67+
EndProject
6868
Global
6969
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7070
Debug|Any CPU = Debug|Any CPU
@@ -141,6 +141,10 @@ Global
141141
{3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Debug|Any CPU.Build.0 = Debug|Any CPU
142142
{3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Release|Any CPU.ActiveCfg = Release|Any CPU
143143
{3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Release|Any CPU.Build.0 = Release|Any CPU
144+
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145+
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
146+
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}.Release|Any CPU.Build.0 = Release|Any CPU
144148
EndGlobalSection
145149
GlobalSection(SolutionProperties) = preSolution
146150
HideSolutionNode = FALSE
@@ -150,7 +154,6 @@ Global
150154
{BCFBE330-871A-44BE-9016-83845231230F} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
151155
{D5162088-C119-4A06-896D-E65983CAEDFD} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
152156
{3BA93614-3A4A-49B0-BFBC-7831E2C02BB7} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
153-
{35C9CCB7-D8B6-4161-BB0D-BCFA7C6DCFFB} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
154157
{EDDDAED1-0E37-4ED7-A595-63F686DEE90A} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
155158
{38920568-003E-448F-963B-41B739D1E01C} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
156159
{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
@@ -167,13 +170,9 @@ Global
167170
{AACC1353-EA9B-4FCE-A50F-6A27900C088C} = {B2312621-6D0A-429F-9A45-06B45CE69691}
168171
{98B2CC4A-33EB-4310-B08D-3DB58630E981} = {B2312621-6D0A-429F-9A45-06B45CE69691}
169172
{3746E49F-DD26-4CBD-B961-0ADF6EA84909} = {B2312621-6D0A-429F-9A45-06B45CE69691}
173+
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
170174
EndGlobalSection
171175
GlobalSection(ExtensibilityGlobals) = postSolution
172176
SolutionGuid = {85400884-5FFD-4C27-A571-58CB3C8CAAC5}
173177
EndGlobalSection
174-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
175-
test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{35c9ccb7-d8b6-4161-bb0d-bcfa7c6dcffb}*SharedItemsImports = 13
176-
test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{3ba93614-3a4a-49b0-bfbc-7831e2c02bb7}*SharedItemsImports = 5
177-
test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{edddaed1-0e37-4ed7-a595-63f686dee90a}*SharedItemsImports = 5
178-
EndGlobalSection
179178
EndGlobal

‎src/WebJobs.Script.Grpc/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Benchmarks")]
77
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
88
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]
9+
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Shared")]
910
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

‎src/WebJobs.Script.WebHost/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Benchmarks")]
77
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
88
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]
9+
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Shared")]
910

1011
// This assembly is the default dynamic assembly generated by Castle DynamicProxy used by Moq.
1112
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

‎src/WebJobs.Script/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.WebHost.Core")]
2020
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
2121
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]
22+
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Shared")]
2223
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

‎test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<ItemGroup>
3535
<ProjectReference Include="../../src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj" />
3636
<ProjectReference Include="../../src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj" />
37+
<ProjectReference Include="../WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.csproj" />
3738
<ProjectReference Include="../Resources/TestProjects/**/*.csproj" ReferenceOutputAssembly="false" />
3839
<ProjectReference Update="../Resources/TestProjects/TestFunctions/TestFunctions.csproj" Private="true" ReferenceOutputAssembly="true" />
3940
</ItemGroup>
@@ -60,6 +61,4 @@
6061
<None Update="Management/Payload/DurableMsSQLProviderPayload.json" CopyToOutputDirectory="PreserveNewest" />
6162
</ItemGroup>
6263

63-
<Import Project="../WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.projitems" Label="Shared" />
64-
6564
</Project>

‎test/WebJobs.Script.Tests.Shared/HttpTestHelpers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static HttpRequest CreateHttpRequest(string method, string uriString, IHe
2828

2929
if (!string.IsNullOrEmpty(uri.Host))
3030
{
31-
headers.Add("Host", uri.Host);
31+
headers.Host = uri.Host;
3232
}
3333

3434
if (body != null)
@@ -50,7 +50,7 @@ public static HttpRequest CreateHttpRequest(string method, string uriString, IHe
5050

5151
requestFeature.Body = new MemoryStream(bytes);
5252
request.ContentLength = request.Body.Length;
53-
headers.Add("Content-Length", request.Body.Length.ToString());
53+
headers.ContentLength = request.Body.Length;
5454
}
5555

5656
requestFeature.Headers = headers;

‎test/WebJobs.Script.Tests.Shared/TestOptionsMonitor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public IDisposable OnChange(Action<T, string> listener)
4040
return Disposable.Empty;
4141
}
4242

43-
internal void InvokeChanged()
43+
public void InvokeChanged()
4444
{
4545
_listener?.Invoke(CurrentValue, null);
4646
}

‎test/WebJobs.Script.Tests.Shared/TestOutputHelperLogger.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Microsoft.Azure.WebJobs.Script.Tests
99
{
10-
internal class TestOutputHelperLogger : ILogger
10+
public class TestOutputHelperLogger : ILogger
1111
{
1212
private readonly ITestOutputHelper _outputHelper;
1313

‎test/WebJobs.Script.Tests.Shared/TestSecretManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.Azure.WebJobs.Script.Tests
1212
{
1313
public class TestSecretManager : ISecretManager
1414
{
15-
internal const string TestMasterKey = "1234";
15+
public const string TestMasterKey = "1234";
1616
private Dictionary<string, string> _hostSystemKeys;
1717
private Dictionary<string, string> _hostFunctionKeys;
1818

‎test/WebJobs.Script.Tests.Shared/TestServiceCollectionExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Microsoft.Azure.WebJobs.Script.Tests
99
{
10-
internal static class TestServiceCollectionExtensions
10+
public static class TestServiceCollectionExtensions
1111
{
1212
public static IServiceCollection SkipDependencyValidation(this IServiceCollection services)
1313
{

0 commit comments

Comments
 (0)