Skip to content

Update Tests.Shared from shproj to csproj #11187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Update Tests.Shared from shproj to csproj #11187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions WebJobs.Script.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{AFB0F5F7-A
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Tests", "test\WebJobs.Script.Tests\WebJobs.Script.Tests.csproj", "{3BA93614-3A4A-49B0-BFBC-7831E2C02BB7}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Grpc", "src\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj", "{38920568-003E-448F-963B-41B739D1E01C}"
Expand Down Expand Up @@ -65,6 +63,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFunctions", "test\Resou
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobsStartupTests", "test\Resources\TestProjects\WebJobsStartupTests\WebJobsStartupTests.csproj", "{3746E49F-DD26-4CBD-B961-0ADF6EA84909}"
EndProject
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -141,6 +141,10 @@ Global
{3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Release|Any CPU.Build.0 = Release|Any CPU
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -150,7 +154,6 @@ Global
{BCFBE330-871A-44BE-9016-83845231230F} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
{D5162088-C119-4A06-896D-E65983CAEDFD} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
{3BA93614-3A4A-49B0-BFBC-7831E2C02BB7} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
{35C9CCB7-D8B6-4161-BB0D-BCFA7C6DCFFB} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
{EDDDAED1-0E37-4ED7-A595-63F686DEE90A} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
{38920568-003E-448F-963B-41B739D1E01C} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
Expand All @@ -167,13 +170,9 @@ Global
{AACC1353-EA9B-4FCE-A50F-6A27900C088C} = {B2312621-6D0A-429F-9A45-06B45CE69691}
{98B2CC4A-33EB-4310-B08D-3DB58630E981} = {B2312621-6D0A-429F-9A45-06B45CE69691}
{3746E49F-DD26-4CBD-B961-0ADF6EA84909} = {B2312621-6D0A-429F-9A45-06B45CE69691}
{6C6ABC17-1262-4AD8-8CDA-AF6819EF60EE} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {85400884-5FFD-4C27-A571-58CB3C8CAAC5}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{35c9ccb7-d8b6-4161-bb0d-bcfa7c6dcffb}*SharedItemsImports = 13
test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{3ba93614-3a4a-49b0-bfbc-7831e2c02bb7}*SharedItemsImports = 5
test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{edddaed1-0e37-4ed7-a595-63f686dee90a}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions src/WebJobs.Script.Grpc/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Benchmarks")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Shared")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
1 change: 1 addition & 0 deletions src/WebJobs.Script.WebHost/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Benchmarks")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Shared")]

// This assembly is the default dynamic assembly generated by Castle DynamicProxy used by Moq.
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
1 change: 1 addition & 0 deletions src/WebJobs.Script/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.WebHost.Core")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]
[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Shared")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
3 changes: 1 addition & 2 deletions test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<ItemGroup>
<ProjectReference Include="../../src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj" />
<ProjectReference Include="../../src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj" />
<ProjectReference Include="../WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.csproj" />
<ProjectReference Include="../Resources/TestProjects/**/*.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Update="../Resources/TestProjects/TestFunctions/TestFunctions.csproj" Private="true" ReferenceOutputAssembly="true" />
</ItemGroup>
Expand All @@ -60,6 +61,4 @@
<None Update="Management/Payload/DurableMsSQLProviderPayload.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<Import Project="../WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.projitems" Label="Shared" />

</Project>
4 changes: 2 additions & 2 deletions test/WebJobs.Script.Tests.Shared/HttpTestHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static HttpRequest CreateHttpRequest(string method, string uriString, IHe

if (!string.IsNullOrEmpty(uri.Host))
{
headers.Add("Host", uri.Host);
headers.Host = uri.Host;
}

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

requestFeature.Body = new MemoryStream(bytes);
request.ContentLength = request.Body.Length;
headers.Add("Content-Length", request.Body.Length.ToString());
headers.ContentLength = request.Body.Length;
}

requestFeature.Headers = headers;
Expand Down
2 changes: 1 addition & 1 deletion test/WebJobs.Script.Tests.Shared/TestOptionsMonitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public IDisposable OnChange(Action<T, string> listener)
return Disposable.Empty;
}

internal void InvokeChanged()
public void InvokeChanged()
{
_listener?.Invoke(CurrentValue, null);
}
Expand Down
2 changes: 1 addition & 1 deletion test/WebJobs.Script.Tests.Shared/TestOutputHelperLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Microsoft.Azure.WebJobs.Script.Tests
{
internal class TestOutputHelperLogger : ILogger
public class TestOutputHelperLogger : ILogger
{
private readonly ITestOutputHelper _outputHelper;

Expand Down
2 changes: 1 addition & 1 deletion test/WebJobs.Script.Tests.Shared/TestSecretManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Microsoft.Azure.WebJobs.Script.Tests
{
public class TestSecretManager : ISecretManager
{
internal const string TestMasterKey = "1234";
public const string TestMasterKey = "1234";
private Dictionary<string, string> _hostSystemKeys;
private Dictionary<string, string> _hostFunctionKeys;

Expand Down
2 changes: 1 addition & 1 deletion test/WebJobs.Script.Tests.Shared/TestServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Microsoft.Azure.WebJobs.Script.Tests
{
internal static class TestServiceCollectionExtensions
public static class TestServiceCollectionExtensions
{
public static IServiceCollection SkipDependencyValidation(this IServiceCollection services)
{
Expand Down
18 changes: 18 additions & 0 deletions test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Microsoft.Azure.WebJobs.Script.Tests.Shared</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.3" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="xunit" Version="2.4.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="../../src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj" />
</ItemGroup>

</Project>
56 changes: 0 additions & 56 deletions test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.projitems
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions test/WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.shproj
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<ProjectReference Include="../../src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj" />
<ProjectReference Include="../../src/WebJobs.Script/WebJobs.Script.csproj" />
<ProjectReference Include="../../src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj" />
<ProjectReference Include="../WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.csproj" />
</ItemGroup>

<ItemGroup>
Expand All @@ -58,6 +59,4 @@
<EmbeddedResource Update="Resources/FileProvisioning/PowerShell/profile.ps1" CopyToOutputDirectory="Never" />
</ItemGroup>

<Import Project="../WebJobs.Script.Tests.Shared/WebJobs.Script.Tests.Shared.projitems" Label="Shared" />

</Project>