Skip to content

Commit 8f19cf6

Browse files
jviaujviau
authored
Update CSharpPrecompiledTestProjects to func v4 (#10095)
1 parent 3dc33ec commit 8f19cf6

File tree

12 files changed

+29
-31
lines changed

12 files changed

+29
-31
lines changed

‎test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Net.Sdk.Functions" Version="3.0.*" />
8+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
99
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1010
</ItemGroup>
1111
<ItemGroup>

‎test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/Function1.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static IActionResult Run([HttpTrigger(AuthorizationLevel.Anonymous, "get"
2424

2525
void LoadType()
2626
{
27-
var assembly = context.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=12.0.3.0"));
27+
var assembly = context.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=13.0.1.0"));
2828
}
2929

3030
List<Thread> threads = new List<Thread>();
@@ -43,8 +43,8 @@ void LoadType()
4343

4444
// Now, make sure the assemblies match, signifying that the race was fixed and we
4545
// always load the host's version.
46-
var functionAssembly = context.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=12.0.3.0"));
47-
var defaultAssembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=12.0.3.0"));
46+
var functionAssembly = context.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=13.0.1.0"));
47+
var defaultAssembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=13.0.1.0"));
4848

4949
if (!Equals(functionAssembly, defaultAssembly))
5050
{

‎test/CSharpPrecompiledTestProjects/CSharpPrecompiledTestProjects.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultipleDependencyVersions"
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{297CEDAC-BB8E-4875-A3FF-7BA7A4916E73}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependency55", "DependencyA\Dependency55.csproj", "{BC456A9E-D140-4B1A-84D9-AB82556F5881}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependency55", "Dependency55\Dependency55.csproj", "{BC456A9E-D140-4B1A-84D9-AB82556F5881}"
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependency56", "Dependency56\Dependency56.csproj", "{B3B098F6-B2B8-4219-AA52-29F55427496A}"
1919
EndProject

‎test/CSharpPrecompiledTestProjects/DependencyA/Dependency55.csproj renamed to ‎test/CSharpPrecompiledTestProjects/Dependency55/Dependency55.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>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎test/CSharpPrecompiledTestProjects/DependencyA/TypeGetter.cs renamed to ‎test/CSharpPrecompiledTestProjects/Dependency55/TypeGetter.cs

File renamed without changes.

‎test/CSharpPrecompiledTestProjects/Dependency56/Dependency56.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>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.7" />
8+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<ProjectReference Include="..\Dependency56\Dependency56.csproj" />
12-
<ProjectReference Include="..\DependencyA\Dependency55.csproj" />
12+
<ProjectReference Include="..\Dependency55\Dependency55.csproj" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<None Update="host.json">

‎test/CSharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.7" />
8-
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.2.0" />
7+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
8+
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.22.0" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<None Update="host.json">

‎test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ namespace ReferenceOlderRuntimeAssembly
88
{
99
public class ReferenceOlderRuntimeAssembly
1010
{
11-
private readonly IHostingEnvironment _env;
11+
private readonly IHostEnvironment _env;
1212

13-
public ReferenceOlderRuntimeAssembly(IHostingEnvironment env)
13+
public ReferenceOlderRuntimeAssembly(IHostEnvironment env)
1414
{
1515
_env = env;
1616
}
@@ -21,7 +21,7 @@ public IActionResult Run(
2121
{
2222
if (_env == null)
2323
{
24-
return new ObjectResult("IHostingEnvironment was not injected into the function class.")
24+
return new ObjectResult("IHostEnvironment was not injected into the function class.")
2525
{
2626
StatusCode = 500
2727
};

‎test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.4" />
9-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.11" />
8+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.3.0" />
9+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
10+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<None Update="host.json">

0 commit comments

Comments
 (0)