Update CSharpPrecompiledTestProjects to func v4 (#10095)

Azure · May 6, 2024 · 079bafd · 079bafd
1 parent dd66a39
commit 079bafd
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 31 deletions.
diff --git a/test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj b/test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AzureFunctionsVersion>v3</AzureFunctionsVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
   </PropertyGroup>
   <ItemGroup>    
-    <PackageReference Include="Microsoft.Net.Sdk.Functions" Version="3.0.*" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/Function1.cs b/test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/Function1.cs
@@ -24,7 +24,7 @@ public static IActionResult Run([HttpTrigger(AuthorizationLevel.Anonymous, "get"
 
                 void LoadType()
                 {
-                    var assembly = context.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=12.0.3.0"));
+                    var assembly = context.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=13.0.1.0"));
                 }
 
                 List<Thread> threads = new List<Thread>();
@@ -43,8 +43,8 @@ void LoadType()
 
                 // Now, make sure the assemblies match, signifying that the race was fixed and we 
                 // always load the host's version.
-                var functionAssembly = context.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=12.0.3.0"));
-                var defaultAssembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=12.0.3.0"));
+                var functionAssembly = context.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=13.0.1.0"));
+                var defaultAssembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName("Newtonsoft.Json, Version=13.0.1.0"));
 
                 if (!Equals(functionAssembly, defaultAssembly))
                 {

diff --git a/test/CSharpPrecompiledTestProjects/CSharpPrecompiledTestProjects.sln b/test/CSharpPrecompiledTestProjects/CSharpPrecompiledTestProjects.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultipleDependencyVersions"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{297CEDAC-BB8E-4875-A3FF-7BA7A4916E73}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependency55", "DependencyA\Dependency55.csproj", "{BC456A9E-D140-4B1A-84D9-AB82556F5881}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependency55", "Dependency55\Dependency55.csproj", "{BC456A9E-D140-4B1A-84D9-AB82556F5881}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependency56", "Dependency56\Dependency56.csproj", "{B3B098F6-B2B8-4219-AA52-29F55427496A}"
 EndProject

diff --git a/...tProjects/DependencyA/Dependency55.csproj → ...Projects/Dependency55/Dependency55.csproj b/...tProjects/DependencyA/Dependency55.csproj → ...Projects/Dependency55/Dependency55.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ledTestProjects/DependencyA/TypeGetter.cs → ...edTestProjects/Dependency55/TypeGetter.cs b/...ledTestProjects/DependencyA/TypeGetter.cs → ...edTestProjects/Dependency55/TypeGetter.cs
diff --git a/test/CSharpPrecompiledTestProjects/Dependency56/Dependency56.csproj b/test/CSharpPrecompiledTestProjects/Dependency56/Dependency56.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...SharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj b/...SharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AzureFunctionsVersion>v3</AzureFunctionsVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.7" />    
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dependency56\Dependency56.csproj" />
-    <ProjectReference Include="..\DependencyA\Dependency55.csproj" />
+    <ProjectReference Include="..\Dependency55\Dependency55.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

diff --git a/...SharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj b/...SharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AzureFunctionsVersion>v3</AzureFunctionsVersion>    
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>    
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.7" />
-    <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.22.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

diff --git a/...arpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.cs b/...arpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.cs
@@ -8,9 +8,9 @@ namespace ReferenceOlderRuntimeAssembly
 {
     public class ReferenceOlderRuntimeAssembly
     {
-        private readonly IHostingEnvironment _env;
+        private readonly IHostEnvironment _env;
 
-        public ReferenceOlderRuntimeAssembly(IHostingEnvironment env)
+        public ReferenceOlderRuntimeAssembly(IHostEnvironment env)
         {
             _env = env;
         }
@@ -21,7 +21,7 @@ public ReferenceOlderRuntimeAssembly(IHostingEnvironment env)
         {
             if (_env == null)
             {
-                return new ObjectResult("IHostingEnvironment was not injected into the function class.")
+                return new ObjectResult("IHostEnvironment was not injected into the function class.")
                 {
                     StatusCode = 500
                 };

diff --git a/...recompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj b/...recompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AzureFunctionsVersion>v3</AzureFunctionsVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.11" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

diff --git a/test/CSharpPrecompiledTestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj b/test/CSharpPrecompiledTestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AzureFunctionsVersion>V3</AzureFunctionsVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.*" />
-    <PackageReference Include="Microsoft.Net.Sdk.Functions" Version="3.0.*" />
+    <PackageReference Include="Microsoft.Net.Sdk.Functions" Version="4.3.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -60,9 +60,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\WebJobs.Script.WebHost\WebJobs.Script.WebHost.csproj" />
     <ProjectReference Include="..\..\src\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj" />
-    <ProjectReference Include="..\TestFunctions\TestFunctions.csproj">
-      <Private>true</Private>
-    </ProjectReference>
+    <ProjectReference Include="..\TestFunctions\TestFunctions.csproj" Private="true" />
   </ItemGroup>
 
   <ItemGroup>