Skip to content

Commit 76ad447

Browse files
[v3.x] Updating target for test app (#8197)
* Updating target for test app * Updating Integration/Test Projects * Changing test tartget for 3.x * Updating metadata generator targets * Updating pipeline to install .NET Core 2.1 * Updating build environment * Updating installation to include the .NET Core 2.1 runtime * Changing PS worker runtime version Co-authored-by: Fabio Cavalcante <[email protected]> Co-authored-by: Fabio Cavalcante <[email protected]>
1 parent 3a1bbf4 commit 76ad447

File tree

10 files changed

+19
-135
lines changed

10 files changed

+19
-135
lines changed

azure-pipelines.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ jobs:
6262
packageType: 'sdk'
6363
version: '3.1.x'
6464
performMultiLevelLookup: true
65+
- task: UseDotNet@2
66+
displayName: 'Install .NET Core 2.1 runtime'
67+
inputs:
68+
packageType: runtime
69+
version: 2.1.x
70+
performMultiLevelLookup: true
6571
- task: PowerShell@2
6672
displayName: "Build artifacts"
6773
inputs:
@@ -424,6 +430,12 @@ jobs:
424430
packageType: 'sdk'
425431
version: '3.1.x'
426432
performMultiLevelLookup: true
433+
- task: UseDotNet@2
434+
displayName: 'Install .NET Core 2.1 runtime (tests)'
435+
inputs:
436+
packageType: runtime
437+
version: 2.1.x
438+
performMultiLevelLookup: true
427439
- task: UseNode@1
428440
inputs:
429441
version: '10.x'

test/CSharpPrecompiledTestProjects/CSharpPrecompiledTestProjects.sln

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30413.136
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32210.238
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobsStartupTests", "WebJobsStartupTests\WebJobsStartupTests.csproj", "{EB7FC98C-1EF9-40E3-B7B2-858AA2547B1F}"
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoadContextRace", "AssemblyLoadContextRace\AssemblyLoadContextRace.csproj", "{1E882F3E-E1D1-4D56-A575-8530596705C3}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeDependencyOldSdk", "NativeDependencyOldSdk\NativeDependencyOldSdk.csproj", "{C2164420-D424-4737-8A21-CEADEC619FDB}"
11-
EndProject
1210
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeDependencyNoRuntimes", "NativeDependencyNoRuntimes\NativeDependencyNoRuntimes.csproj", "{928B573E-904B-4733-86A2-6CDBF78D24AA}"
1311
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultipleDependencyVersions", "MultipleDependencyVersions\MultipleDependencyVersions.csproj", "{D0AF8295-7CBF-45EB-914F-7105A9F53B69}"
@@ -19,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependency55", "DependencyA
1917
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependency56", "Dependency56\Dependency56.csproj", "{B3B098F6-B2B8-4219-AA52-29F55427496A}"
2119
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferenceOlderRuntimeAssembly", "ReferenceOlderRuntimeAssembly\ReferenceOlderRuntimeAssembly.csproj", "{C3E99727-F4A3-47D9-9DF6-8EE85AE0C29A}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReferenceOlderRuntimeAssembly", "ReferenceOlderRuntimeAssembly\ReferenceOlderRuntimeAssembly.csproj", "{C3E99727-F4A3-47D9-9DF6-8EE85AE0C29A}"
2321
EndProject
2422
Global
2523
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +33,6 @@ Global
3533
{1E882F3E-E1D1-4D56-A575-8530596705C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
3634
{1E882F3E-E1D1-4D56-A575-8530596705C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
3735
{1E882F3E-E1D1-4D56-A575-8530596705C3}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{C2164420-D424-4737-8A21-CEADEC619FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{C2164420-D424-4737-8A21-CEADEC619FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{C2164420-D424-4737-8A21-CEADEC619FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{C2164420-D424-4737-8A21-CEADEC619FDB}.Release|Any CPU.Build.0 = Release|Any CPU
4236
{928B573E-904B-4733-86A2-6CDBF78D24AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4337
{928B573E-904B-4733-86A2-6CDBF78D24AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
4438
{928B573E-904B-4733-86A2-6CDBF78D24AA}.Release|Any CPU.ActiveCfg = Release|Any CPU

test/CSharpPrecompiledTestProjects/NativeDependencyOldSdk/NativeDependencyOldSdk.cs

Lines changed: 0 additions & 63 deletions
This file was deleted.

test/CSharpPrecompiledTestProjects/NativeDependencyOldSdk/NativeDependencyOldSdk.csproj

Lines changed: 0 additions & 20 deletions
This file was deleted.

test/CSharpPrecompiledTestProjects/NativeDependencyOldSdk/host.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/TestFunctions/TestFunctions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/FunctionAssemblyLoadContextEndToEndTests.cs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,6 @@ await RunTest(async () =>
4040
});
4141
}
4242

43-
[Fact]
44-
public async Task NativeDependency_Quirks()
45-
{
46-
// Test a specific bug that hit on v2 with earlier versions of the VS SDK, only
47-
// when publishing
48-
49-
await RunTest(async () =>
50-
{
51-
var config = TestHelpers.GetTestConfiguration();
52-
var connStr = config.GetConnectionString("CosmosDB");
53-
string cosmosKey = "ConnectionStrings__CosmosDB";
54-
55-
var envVars = new Dictionary<string, string>
56-
{
57-
{ cosmosKey, connStr }
58-
};
59-
60-
_launcher = new HostProcessLauncher("NativeDependencyOldSdk", envVars, usePublishPath: true, "netcoreapp2.2");
61-
await _launcher.StartHostAsync();
62-
63-
var client = _launcher.HttpClient;
64-
var response = await client.GetAsync($"api/NativeDependencyOldSdk");
65-
66-
// The function does all the validation internally.
67-
Assert.True(HttpStatusCode.OK == response.StatusCode, $"Test failed with {response.StatusCode}: {await response.Content.ReadAsStringAsync()}");
68-
});
69-
}
70-
7143
[Fact]
7244
public async Task NativeDependency_NoRuntimes()
7345
{

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SamplesEndToEndTests_PowerShell.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static TestFixture()
5151
}
5252

5353
public TestFixture()
54-
: base(Path.Combine(Environment.CurrentDirectory, @"..", "..", "..", "..", "..", "sample", "PowerShell"), "samples", RpcWorkerConstants.PowerShellLanguageWorkerName)
54+
: base(Path.Combine(Environment.CurrentDirectory, @"..", "..", "..", "..", "..", "sample", "PowerShell"), "samples", RpcWorkerConstants.PowerShellLanguageWorkerName, functionsWorkerRuntimeVersion: "7")
5555
{
5656
}
5757

tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\metadatagenerator.props" />
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<AssemblyName>Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator.Console</AssemblyName>
77
<RootNamespace>Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator.Console</RootNamespace>
88
<BuildOutputTargetFolder>tools</BuildOutputTargetFolder>

tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="UpdateRuntimeAssemblies">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\..\..\..\src.ruleset</CodeAnalysisRuleSet>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)