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

Fix tests for .NET upgrade #1055

Merged
merged 1 commit into from
Nov 19, 2024
Merged

Fix tests for .NET upgrade #1055

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
2 changes: 1 addition & 1 deletion fixtures/console_app/console_app.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
30 changes: 18 additions & 12 deletions fixtures/console_app/obj/console_app.csproj.nuget.dgspec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,55 @@
{
"format": 1,
"restore": {
"/test/test/console_app/console_app.csproj": {}
"/simple/console_app.csproj": {}
},
"projects": {
"/test/test/console_app/console_app.csproj": {
"/simple/console_app.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "/test/test/console_app/console_app.csproj",
"projectUniqueName": "/simple/console_app.csproj",
"projectName": "console_app",
"projectPath": "/test/test/console_app/console_app.csproj",
"projectPath": "/simple/console_app.csproj",
"packagesPath": "/root/.nuget/packages/",
"outputPath": "/test/test/console_app/obj/",
"outputPath": "/simple/obj/",
"projectStyle": "PackageReference",
"configFilePaths": [
"/root/.nuget/NuGet/NuGet.Config"
],
"originalTargetFrameworks": [
"net6.0"
"net8.0"
],
"sources": {
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"net8.0": {
"targetAlias": "net8.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
},
"restoreAuditProperties": {
"enableAudit": "true",
"auditLevel": "low",
"auditMode": "direct"
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"net8.0": {
"targetAlias": "net8.0",
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
Expand All @@ -52,7 +58,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/6.0.300/RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion fixtures/console_app/obj/console_app.csproj.nuget.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/root/.nuget/packages/</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/root/.nuget/packages/</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.2.0</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.11.1</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="/root/.nuget/packages/" />
Expand Down
30 changes: 18 additions & 12 deletions fixtures/console_app/obj/project.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,61 @@
{
"version": 3,
"targets": {
"net6.0": {}
"net8.0": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"net6.0": []
"net8.0": []
},
"packageFolders": {
"/root/.nuget/packages/": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "/test/test/console_app/console_app.csproj",
"projectUniqueName": "/simple/console_app.csproj",
"projectName": "console_app",
"projectPath": "/test/test/console_app/console_app.csproj",
"projectPath": "/simple/console_app.csproj",
"packagesPath": "/root/.nuget/packages/",
"outputPath": "/test/test/console_app/obj/",
"outputPath": "/simple/obj/",
"projectStyle": "PackageReference",
"configFilePaths": [
"/root/.nuget/NuGet/NuGet.Config"
],
"originalTargetFrameworks": [
"net6.0"
"net8.0"
],
"sources": {
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"net8.0": {
"targetAlias": "net8.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
},
"restoreAuditProperties": {
"enableAudit": "true",
"auditLevel": "low",
"auditMode": "direct"
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"net8.0": {
"targetAlias": "net8.0",
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
Expand All @@ -58,7 +64,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/6.0.300/RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions fixtures/console_app/obj/project.nuget.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": 2,
"dgSpecHash": "C2ow/hc9AYgTvi8zon4y9R5HR1awmAeFuvovvAqFuR7OXh5H98KeFyjB8/f8iNDAH33tclHimz7HxiEAu0H29w==",
"dgSpecHash": "RzQoAPABuUE=",
"success": true,
"projectFilePath": "/test/test/console_app/console_app.csproj",
"projectFilePath": "/simple/console_app.csproj",
"expectedPackageFiles": [],
"logs": []
}
2 changes: 1 addition & 1 deletion fixtures/fsharp/fsharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp6.0</TargetFramework>
<TargetFramework>netcoreapp8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions fixtures/node_apps/angular_dotnet/source-app.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.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<SpaRoot>ClientApp\</SpaRoot>
Expand All @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.6" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion fixtures/source_apps/multiple_projects_msbuild/src/asp_web_app/asp_web_app.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp6.0</TargetFramework>
<TargetFramework>netcoreapp8.0</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>asp_web_app</AssemblyName>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion fixtures/source_apps/multiple_projects_msbuild/src/console_app/console_app.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp6.0</TargetFramework>
<TargetFramework>netcoreapp8.0</TargetFramework>
<AssemblyName>console_app</AssemblyName>
</PropertyGroup>

Expand Down
38 changes: 22 additions & 16 deletions fixtures/source_apps/simple_legacy_openssl/obj/project.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,61 @@
{
"version": 3,
"targets": {
"net6.0": {}
"net8.0": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"net6.0": []
"net8.0": []
},
"packageFolders": {
"/Users/meyera/.nuget/packages/": {}
"/root/.nuget/packages/": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj",
"projectName": "source_6.0",
"projectPath": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj",
"packagesPath": "/Users/meyera/.nuget/packages/",
"outputPath": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/obj/",
"projectUniqueName": "/simple/source_8.0.csproj",
"projectName": "source_8.0",
"projectPath": "/simple/source_8.0.csproj",
"packagesPath": "/root/.nuget/packages/",
"outputPath": "/simple/obj/",
"projectStyle": "PackageReference",
"configFilePaths": [
"/Users/meyera/.nuget/NuGet/NuGet.Config"
"/root/.nuget/NuGet/NuGet.Config"
],
"originalTargetFrameworks": [
"net6.0"
"net8.0"
],
"sources": {
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"net8.0": {
"targetAlias": "net8.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
},
"restoreAuditProperties": {
"enableAudit": "true",
"auditLevel": "low",
"auditMode": "direct"
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"net8.0": {
"targetAlias": "net8.0",
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
Expand All @@ -61,7 +67,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/6.0.101/RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions fixtures/source_apps/simple_legacy_openssl/obj/project.nuget.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": 2,
"dgSpecHash": "AJn9YIdR423CAUiEHQ0GiDtC/VV9wjJwO+5G5KNp060BKPM/352rK+gi6uLM8aT0dIp3slRmXMIfi4KIIIhTIA==",
"dgSpecHash": "39a3Oet003Y=",
"success": true,
"projectFilePath": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj",
"projectFilePath": "/simple/source_8.0.csproj",
"expectedPackageFiles": [],
"logs": []
}
Loading
Loading