Skip to content
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

Jump to bottom

[1ES] [CG] Update CSharpPrecompiledTestProjects to func v4 #10095

Merged
merged 1 commit into from
May 6, 2024
Merged

[1ES] [CG] Update CSharpPrecompiledTestProjects to func v4 #10095

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/Function1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand All @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion test/CSharpPrecompiledTestProjects/CSharpPrecompiledTestProjects.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...tProjects/DependencyA/Dependency55.csproj → ...Projects/Dependency55/Dependency55.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
0 ...ledTestProjects/DependencyA/TypeGetter.cs → ...edTestProjects/Dependency55/TypeGetter.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/CSharpPrecompiledTestProjects/Dependency56/Dependency56.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...SharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
8 changes: 4 additions & 4 deletions ...SharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
6 changes: 3 additions & 3 deletions ...arpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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
};
Expand Down
10 changes: 5 additions & 5 deletions ...recompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
6 changes: 3 additions & 3 deletions test/CSharpPrecompiledTestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 1 addition & 3 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 @@ -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>
Expand Down